Skip to content

Commit

Permalink
Minor fixes (#97)
Browse files Browse the repository at this point in the history
* Fix letter spacing

* Fix sidebar styles
  • Loading branch information
dominik-zeglen committed Dec 14, 2021
1 parent 83e3f26 commit d694292
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/LayoutButton/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const useStyles = makeStyles(
fontSize: theme.typography.body1.fontSize,
fontWeight: 500,
height: 40,
letterSpacing: "0.06rem",
letterSpacing: "0.02rem",
padding: theme.spacing(0.5, 2),
textAlign: "center",
transition: theme.transitions.duration.shorter + "ms",
Expand Down
7 changes: 4 additions & 3 deletions src/Sidebar/ExpandButton.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ButtonProps } from "@material-ui/core/Button";
import clsx from "clsx";
import React from "react";
import { ArrowRightIcon } from "../icons";
import { ChevronIcon } from "../icons";

import { SquareButton } from "../SquareButton";
import { makeStyles } from "../theme";
Expand All @@ -10,9 +10,10 @@ const useStyles = makeStyles(
(theme) => ({
arrow: {
transition: theme.transitions.duration.shortest + "ms",
transform: "rotate(-90deg)",
},
shrunk: {
transform: "scaleX(-1)",
transform: "rotate(-90deg) scaleY(-1)",
},
}),
{
Expand All @@ -32,7 +33,7 @@ export const ExpandButton: React.FC<ExpandButtonProps> = ({

return (
<SquareButton disableRipple {...rest}>
<ArrowRightIcon
<ChevronIcon
className={clsx(classes.arrow, {
[classes.shrunk]: !isShrunk,
})}
Expand Down
2 changes: 1 addition & 1 deletion src/Sidebar/MenuItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const useStyles = makeStyles(
},
labelRoot: {
position: "absolute",
left: 72,
left: 60,
width: 200,
textAlign: "left",
pointerEvents: "none",
Expand Down
3 changes: 3 additions & 0 deletions src/theme/createSaleorTheme/createSaleorTheme.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,9 @@ export const createTheme = (colors: SaleorThemeColors): SaleorTheme =>
icon: <CheckboxIcon />,
indeterminateIcon: <CheckboxIndeterminateIcon />,
},
MuiMenuItem: {
button: false,
},
MuiTableRow: {
hover: true,
},
Expand Down
2 changes: 1 addition & 1 deletion src/theme/createSaleorTheme/overrides/buttons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const buttonOverrides = (colors: SaleorThemeColors): Overrides => {
border: `1px solid ${colors.active[1]}`,
borderRadius: 4,
fontSize: "1.6rem",
letterSpacing: "0.06rem",
letterSpacing: "0.02rem",
lineHeight: 1.55,
padding: "7px 16px",
textTransform: "none",
Expand Down

0 comments on commit d694292

Please sign in to comment.