From 1c7bbd496cfe92c730dca756fe1ba00743ae9dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20=C5=BBegle=C5=84?= Date: Fri, 17 Dec 2021 10:25:53 +0100 Subject: [PATCH 1/2] Add letter spacing and fix font family --- src/LayoutButton/styles.ts | 2 +- src/UserChipMenu/styles.ts | 1 - src/theme/createSaleorTheme/createSaleorTheme.tsx | 2 ++ src/theme/createSaleorTheme/overrides/buttons.ts | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/LayoutButton/styles.ts b/src/LayoutButton/styles.ts index d53f3970..2ad29901 100644 --- a/src/LayoutButton/styles.ts +++ b/src/LayoutButton/styles.ts @@ -13,13 +13,13 @@ const useStyles = makeStyles( background: theme.palette.saleor.active[4], color: theme.palette.primary.main, }, + ...theme.typography.body1, background: fade(theme.palette.background.paper, 0.4), borderRadius: 4, color: theme.palette.text.secondary, fontSize: theme.typography.body1.fontSize, fontWeight: 500, height: 40, - letterSpacing: "0.02rem", padding: theme.spacing(0.5, 2), textAlign: "center", transition: theme.transitions.duration.shorter + "ms", diff --git a/src/UserChipMenu/styles.ts b/src/UserChipMenu/styles.ts index ddc14ea6..b6ad819b 100644 --- a/src/UserChipMenu/styles.ts +++ b/src/UserChipMenu/styles.ts @@ -36,7 +36,6 @@ const useStyles = makeStyles( justifyContent: "center", }, label: { - letterSpacing: "0.02em", lineHeight: 1.2, textAlign: "left", }, diff --git a/src/theme/createSaleorTheme/createSaleorTheme.tsx b/src/theme/createSaleorTheme/createSaleorTheme.tsx index 5cadb8db..48748ca3 100644 --- a/src/theme/createSaleorTheme/createSaleorTheme.tsx +++ b/src/theme/createSaleorTheme/createSaleorTheme.tsx @@ -298,6 +298,7 @@ export const createTheme = (colors: SaleorThemeColors): SaleorTheme => typography: { allVariants: { fontFamily, + letterSpacing: "0.02rem", }, body1: { color: colors.main[1], @@ -311,6 +312,7 @@ export const createTheme = (colors: SaleorThemeColors): SaleorTheme => }, caption: { fontSize: "1.2rem", + letterSpacing: 0, }, fontFamily, h1: { diff --git a/src/theme/createSaleorTheme/overrides/buttons.ts b/src/theme/createSaleorTheme/overrides/buttons.ts index 0046d8ae..5b11d064 100644 --- a/src/theme/createSaleorTheme/overrides/buttons.ts +++ b/src/theme/createSaleorTheme/overrides/buttons.ts @@ -55,7 +55,6 @@ export const buttonOverrides = (colors: SaleorThemeColors): Overrides => { border: `1px solid ${colors.active[1]}`, borderRadius: 4, fontSize: "1.6rem", - letterSpacing: "0.02rem", lineHeight: 1.55, padding: "7px 16px", textTransform: "none", From 6d4b9c1c81d9af0b036af2ce571a8d29da786e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20=C5=BBegle=C5=84?= Date: Tue, 28 Dec 2021 12:59:36 +0100 Subject: [PATCH 2/2] Fix savebar height --- src/ActionBar/styles.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ActionBar/styles.ts b/src/ActionBar/styles.ts index 50cf67b2..44156da6 100644 --- a/src/ActionBar/styles.ts +++ b/src/ActionBar/styles.ts @@ -19,7 +19,7 @@ const useStyles = makeStyles( borderBottomRightRadius: 0, }, root: { - height: 80, + height: 72, }, shadow: { boxShadow: `0 -24px 20px -20px rgba(0, 0, 0, 0.15)`,