From f2140702998a6714ba630386cc91454ea89cd8d9 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 15 Dec 2024 18:52:46 +0100 Subject: [PATCH] FIX: Several cosmetic changes to make the toolbar look like the figmas --- webapp/src/components/toolbar.tsx | 48 +++++++++++++++++++------------ 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/webapp/src/components/toolbar.tsx b/webapp/src/components/toolbar.tsx index fdd7439..3cc94b3 100644 --- a/webapp/src/components/toolbar.tsx +++ b/webapp/src/components/toolbar.tsx @@ -18,7 +18,7 @@ import { Grid2x2X, Italic, PaintBucket, - Paintbrush2, + PaintRoller, Percent, Redo2, Strikethrough, @@ -114,7 +114,7 @@ function Toolbar(properties: ToolbarProperties) { onClick={properties.onCopyStyles} title={t("toolbar.copy_styles")} > - + {"123"} @@ -391,7 +390,9 @@ const ToolbarContainer = styled("div")` font-family: Inter; border-radius: 4px 4px 0px 0px; overflow-x: auto; - padding-left: 11px; + padding: 0px 12px; + gap: 4px; + scrollbar-width: none; `; type TypeButtonProperties = { $pressed: boolean; $underlinedColor?: string }; @@ -399,15 +400,16 @@ export const StyledButton = styled("button")( ({ disabled, $pressed, $underlinedColor }) => { const result = { width: "24px", + minWidth: "24px", height: "24px", display: "inline-flex", alignItems: "center", justifyContent: "center", - fontSize: "26px", - border: "0px solid #fff", - borderRadius: "2px", - marginRight: "5px", + fontSize: "12px", + border: `0px solid ${theme.palette.common.white}`, + borderRadius: "4px", transition: "all 0.2s", + outline: `1px solid ${theme.palette.common.white}`, cursor: "pointer", backgroundColor: "white", padding: "0px", @@ -419,19 +421,28 @@ export const StyledButton = styled("button")( if (disabled) { return { ...result, - color: theme.palette.grey["600"], + color: theme.palette.grey["400"], cursor: "default", }; } return { ...result, - borderTop: $underlinedColor ? "3px solid #FFF" : "none", + borderTop: $underlinedColor + ? `3px solid ${theme.palette.common.white}` + : "none", borderBottom: $underlinedColor ? `3px solid ${$underlinedColor}` : "none", - color: "#21243A", - backgroundColor: $pressed ? "#EEE" : "#FFF", + color: theme.palette.grey["900"], + backgroundColor: $pressed + ? theme.palette.grey["300"] + : theme.palette.common.white, "&:hover": { - backgroundColor: "#F1F2F8", - borderTopColor: "#F1F2F8", + transition: "all 0.2s", + outline: `1px solid ${theme.palette.grey["200"]}`, + borderTopColor: theme.palette.common.white, + }, + "&:active": { + backgroundColor: theme.palette.grey["300"], + outline: `1px solid ${theme.palette.grey["300"]}`, }, }; }, @@ -439,10 +450,9 @@ export const StyledButton = styled("button")( const Divider = styled("div")({ width: "0px", - height: "10px", - borderLeft: "1px solid #E0E0E0", - marginLeft: "5px", - marginRight: "10px", + height: "12px", + borderLeft: `1px solid ${theme.palette.grey["300"]}`, + margin: "0px 12px", }); export default Toolbar;