Skip to content

fix: align shape builder controls with Sistent defaults (#147) #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ankitkr104 wants to merge 2 commits into
base: master
Choose a base branch
from
+33 −11
Open

fix: align shape builder controls with Sistent defaults (#147) #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8470347
fix: align shape builder controls with Sistent defaults (#147)
ankitkr104 Apr 11, 2026
bd6064a
Merge branch 'master' into fix/147-sistent-button-styling
Bhumikagarggg Apr 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 30 additions & 8 deletions site/src/components/ShapeBuilder/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ SVGextend(SVG.Polygon, draw);
const SCALE_PRESETS = [0.25, 0.5, 0.75, 1, 1.25, 1.5, 2, 3];
const MIN_SCALE = 0.1;
const MAX_SCALE = 3;
const CONTROL_HEIGHT = "3.5rem";
const CONTROL_FONT_SIZE = "1.35rem";

const ShapeBuilder = () => {
const boardRef = useRef(null);
Expand Down Expand Up @@ -248,26 +250,46 @@ const ShapeBuilder = () => {
</CanvasContainer>

<Box sx={{ display: "flex", justifyContent: "center", alignItems: "center", gap: 2, mt: 3, mb: 3, flexWrap: "wrap" }}>
<Button variant="contained" onClick={clearShape}>Clear</Button>
<Button variant="contained" onClick={closeShape}>Close Shape</Button>
<Button variant="contained" onClick={clearShape} sx={{ height: CONTROL_HEIGHT, px: 3, textTransform: "none", fontSize: CONTROL_FONT_SIZE }}>Clear</Button>
<Button variant="contained" onClick={closeShape} sx={{ height: CONTROL_HEIGHT, px: 3, textTransform: "none", fontSize: CONTROL_FONT_SIZE }}>Close Shape</Button>

<Box sx={{ display: "flex", alignItems: "center", gap: 1.5, ml: 2 }}>
<FormControl size="small" sx={{ minWidth: 80 }}>
<FormControl sx={{ minWidth: 96 }}>
<Select
id="scale-preset-select"
variant="outlined"
value={currentPreset}
onChange={handlePresetChange}
displayEmpty
aria-label="Scale preset"
sx={{
color: "#fff",
height: CONTROL_HEIGHT,
fontSize: CONTROL_FONT_SIZE,
backgroundColor: "transparent",
color: "primary.main",
"& .MuiSelect-select": {
minHeight: "unset",
height: "100%",
display: "flex",
alignItems: "center",
fontSize: CONTROL_FONT_SIZE,
},
"& .MuiOutlinedInput-notchedOutline": {
borderColor: "primary.main",
},
"&:hover .MuiOutlinedInput-notchedOutline": {
borderColor: "primary.main",
},
"&.Mui-focused .MuiOutlinedInput-notchedOutline": {
borderColor: "primary.main",
},
"& .MuiSelect-icon": {
color: "#fff"
}
color: "primary.main",
},
}}
>
{SCALE_PRESETS.map((preset) => (
<MenuItem key={preset} value={preset}>
<MenuItem key={preset} value={preset} sx={{ fontSize: CONTROL_FONT_SIZE }}>
{preset}×
</MenuItem>
))}
Expand All @@ -289,7 +311,7 @@ const ShapeBuilder = () => {
/>
</Box>

<Typography variant="body2" sx={{ minWidth: "50px", fontWeight: 500 }}>
<Typography variant="body2" sx={{ minWidth: "50px", fontWeight: 500, fontSize: CONTROL_FONT_SIZE }}>
{scale.toFixed(2)}×
</Typography>
</Box>
Expand Down
6 changes: 3 additions & 3 deletions site/src/pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useDarkMode } from "../components/useDarkMode";
import Navigation from "../components/Navigation";
import Footer from "../components/Footer";
import ShapeBuilder from "../components/ShapeBuilder";
import { SistentThemeProviderWithoutBaseLine, Box } from "@sistent/sistent";
import { SistentThemeProvider, Box } from "@sistent/sistent";

const Kbd = styled.kbd`
background-color: ${({ theme }) =>
Expand Down Expand Up @@ -60,7 +60,7 @@ const IndexPage = () => {
const activeTheme = { ...themeMode, mode: theme };

return (
<SistentThemeProviderWithoutBaseLine>
<SistentThemeProvider key={theme} initialMode={theme}>
<ThemeProvider theme={activeTheme}>
<GlobalStyle />
<Navigation theme={theme} toggleTheme={toggleTheme} />
Expand Down Expand Up @@ -113,7 +113,7 @@ const IndexPage = () => {
</Main>
<Footer />
</ThemeProvider>
</SistentThemeProviderWithoutBaseLine>
</SistentThemeProvider>
);
};

Expand Down
Loading