From 203c5ba696ecad3b1d2a2f23caf8b40983bb16ee Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Thu, 3 Sep 2020 19:01:32 +0200 Subject: [PATCH 1/3] Update savebar design --- .../SaveButtonBar/SaveButtonBar.tsx | 103 ++++++++---------- 1 file changed, 48 insertions(+), 55 deletions(-) diff --git a/src/components/SaveButtonBar/SaveButtonBar.tsx b/src/components/SaveButtonBar/SaveButtonBar.tsx index 31944dfe1..adf2bdcdb 100644 --- a/src/components/SaveButtonBar/SaveButtonBar.tsx +++ b/src/components/SaveButtonBar/SaveButtonBar.tsx @@ -1,9 +1,10 @@ import Button from "@material-ui/core/Button"; +import Card from "@material-ui/core/Card"; +import CardContent from "@material-ui/core/CardContent"; import Portal from "@material-ui/core/Portal"; import { makeStyles } from "@material-ui/core/styles"; import useWindowScroll from "@saleor/hooks/useWindowScroll"; import { buttonMessages } from "@saleor/intl"; -import classNames from "classnames"; import React from "react"; import { useIntl } from "react-intl"; @@ -22,7 +23,10 @@ const useStyles = makeStyles( cancelButton: { marginRight: theme.spacing(2) }, - container: { + content: { + "&:last-child": { + paddingBottom: theme.spacing(2) + }, display: "flex", paddingBottom: theme.spacing(2), paddingTop: theme.spacing(2), @@ -38,20 +42,10 @@ const useStyles = makeStyles( color: theme.palette.error.contrastText }, root: { - background: theme.palette.background.default, - borderTop: "1px solid transparent", - boxShadow: `0 -5px 5px 0 ${theme.palette.divider}`, - height: 70, - transition: `box-shadow ${theme.transitions.duration.shortest}ms` + height: 120 }, spacer: { flex: "1" - }, - stop: { - "&$root": { - borderTopColor: theme.palette.divider, - boxShadow: `0 0 0 0 ${theme.palette.divider}` - } } }), { name: "SaveButtonBar" } @@ -92,48 +86,47 @@ export const SaveButtonBar: React.FC = props => { {anchor => anchor ? ( -
- - {!!onDelete && ( - - )} -
- - - {maybe( - () => labels.save, - intl.formatMessage(buttonMessages.save) - )} - +
+ + + + {!!onDelete && ( + + )} +
+ + + {maybe( + () => labels.save, + intl.formatMessage(buttonMessages.save) + )} + + +
From 4780d8fb79e97371a71d2afca73263364c6c5cae Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Thu, 3 Sep 2020 19:03:32 +0200 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e75c66fa..034dff783 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ All notable, unreleased changes to this project will be documented in this file. - Update order history information - #680 by @dominik-zeglen - Add metadata editor to creator views - #684 by @dominik-zeglen - Update product visibility card component - #679 by @AlicjaSzu +- Update savebar design - #690 by @dominik-zeglen ## 2.10.1 From de309be80778145a7aa99090d6dca41d78bbe76c Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Thu, 3 Sep 2020 19:06:47 +0200 Subject: [PATCH 3/3] Update background volor --- src/components/Theme/themes.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Theme/themes.ts b/src/components/Theme/themes.ts index 7dffeed5c..8a17c1bbf 100644 --- a/src/components/Theme/themes.ts +++ b/src/components/Theme/themes.ts @@ -70,7 +70,7 @@ export const dark: IThemeColors = { export const light: IThemeColors = { autofill: "#f4f6c5", background: { - default: "#F1F6F6", + default: "#EFF5F8", paper: "#FFFFFF" }, checkbox: {