From 0b3916f46bf4e167dc7cd2f98ee76fa5125034d6 Mon Sep 17 00:00:00 2001 From: sektordv Date: Thu, 10 Jun 2021 09:28:41 +0200 Subject: [PATCH] added contrast sidebar logos for dark mode --- assets/images/logo-sidebar-dark.svg | 3 +++ src/components/SideBar/SideBar.tsx | 5 ++++- src/components/SideBarDrawer/SideBarDrawer.tsx | 9 ++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 assets/images/logo-sidebar-dark.svg diff --git a/assets/images/logo-sidebar-dark.svg b/assets/images/logo-sidebar-dark.svg new file mode 100644 index 000000000..99ea02741 --- /dev/null +++ b/assets/images/logo-sidebar-dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/SideBar/SideBar.tsx b/src/components/SideBar/SideBar.tsx index 1505065f4..8c7d6b465 100644 --- a/src/components/SideBar/SideBar.tsx +++ b/src/components/SideBar/SideBar.tsx @@ -1,9 +1,11 @@ +import logoDark from "@assets/images/logo-sidebar-dark.svg"; import logoLight from "@assets/images/logo-sidebar-light.svg"; import configurationIcon from "@assets/images/menu-configure-icon.svg"; import { configurationMenuUrl } from "@saleor/configuration"; import { User } from "@saleor/fragments/types/User"; import useLocalStorage from "@saleor/hooks/useLocalStorage"; import { UseNavigatorResult } from "@saleor/hooks/useNavigator"; +import useTheme from "@saleor/hooks/useTheme"; import { sectionNames } from "@saleor/intl"; import { makeStyles } from "@saleor/theme"; import classNames from "classnames"; @@ -74,6 +76,7 @@ const SideBar: React.FC = ({ const [isShrunk, setShrink] = useLocalStorage("isMenuSmall", false); const intl = useIntl(); const configureMenuItem = getConfigureMenuItem(intl); + const { isDark } = useTheme(); return (
= ({ >
- +
{menuItems.map(menuItem => { const isActive = isMenuActive(location, menuItem); diff --git a/src/components/SideBarDrawer/SideBarDrawer.tsx b/src/components/SideBarDrawer/SideBarDrawer.tsx index a1fb78ded..b43a931da 100644 --- a/src/components/SideBarDrawer/SideBarDrawer.tsx +++ b/src/components/SideBarDrawer/SideBarDrawer.tsx @@ -1,7 +1,9 @@ +import logoDark from "@assets/images/logo-sidebar-dark.svg"; import logoLight from "@assets/images/logo-sidebar-light.svg"; import { Drawer, Typography } from "@material-ui/core"; import ArrowLeftIcon from "@material-ui/icons/ArrowLeft"; import MenuIcon from "@material-ui/icons/Menu"; +import useTheme from "@saleor/hooks/useTheme"; import classNames from "classnames"; import React from "react"; import SVG from "react-inlinesvg"; @@ -30,6 +32,8 @@ const SideBarDrawer: React.FC = ({ const configureMenuItem = getConfigureMenuItem(intl); + const { isDark } = useTheme(); + const handleMenuItemClick = (url: string) => { setOpened(false); setShowSubmenu(false); @@ -68,7 +72,10 @@ const SideBarDrawer: React.FC = ({ })} >
- + {menuItems.map(menuItem => { if ( menuItem.permission &&