djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1151 from mirumee/SALEOR-2266/dark-mode-logo-fix

Browse source 
SALEOR-2266 - Added contrast sidebar logos for dark mode
This commit is contained in:
SektorDV 2021-06-22 11:45:55 +02:00 committed by GitHub
commit bf7dfe88b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assets/images/logo-sidebar-dark.svg Normal file
View file

@ -0,0 +1,4 @@
<svg width="36" height="33" viewBox="0 0 36 33" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M19.7838 0L13.4043 6.64709H29.1638L35.5433 0H19.7838Z" fill="#8AC4EB"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.59759 2.13062C6.4332 2.13062 6.27552 2.1958 6.15911 2.31187L0.182532 8.27133C0.00456112 8.44879 -0.0488948 8.71603 0.0471181 8.94829C0.143131 9.18056 0.369679 9.33205 0.621008 9.33205H21.3482C21.5126 9.33205 21.6703 9.26687 21.7867 9.1508L27.7632 3.19134C27.9412 3.01388 27.9947 2.74664 27.8987 2.51437C27.8026 2.28211 27.5761 2.13062 27.3248 2.13062H6.59759ZM2.12325 8.09007L6.85429 3.37259H25.8225L21.0915 8.09007H2.12325ZM23.9789 27.3629C23.9789 30.6214 22.4977 33 16.6072 33C11.4908 33 9.43754 31.599 9 28.1124L13.6451 27.4281C13.9144 29.1551 14.5539 29.5135 16.6745 29.5135C18.5933 29.5135 19.2328 29.0573 19.2328 28.0146C19.2328 26.7437 18.492 26.418 16.5735 26.0594C16.4207 26.0337 16.2653 26.0082 16.1079 25.9823C13.0752 25.4835 9.30464 24.8634 9.33654 20.6504C9.33654 17.2293 11.2216 15.0787 16.5735 15.0787C21.4542 15.0787 23.3055 16.7404 23.7097 20.0314L18.9298 20.7482C18.7614 19.2168 18.2566 18.6954 16.4389 18.6954C14.9577 18.6954 14.0489 19.0867 14.0489 20.1292C14.0489 21.5304 15.0924 21.7258 17.3814 22.1167C20.3772 22.6056 23.9789 23.3549 23.9789 27.3629Z" fill="white"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

5
src/components/SideBar/SideBar.tsx
View file

@ -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<SideBarProps> = ({
const [isShrunk, setShrink] = useLocalStorage("isMenuSmall", false);
const intl = useIntl();
const configureMenuItem = getConfigureMenuItem(intl);
const { isDark } = useTheme();
return (
<div
@ -83,7 +86,7 @@ const SideBar: React.FC<SideBarProps> = ({
>
<div className={classes.float}>
<div className={classes.logo}>
<SVG src={logoLight} />
<SVG src={isDark ? logoDark : logoLight} />
</div>
{menuItems.map(menuItem => {
const isActive = isMenuActive(location, menuItem);

9
src/components/SideBarDrawer/SideBarDrawer.tsx
View file

@ -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<SideBarDrawerProps> = ({
const configureMenuItem = getConfigureMenuItem(intl);
const { isDark } = useTheme();
const handleMenuItemClick = (url: string) => {
setOpened(false);
setShowSubmenu(false);
@ -68,7 +72,10 @@ const SideBarDrawer: React.FC<SideBarDrawerProps> = ({
})}
>
<div className={classes.content}>
<SVG className={classes.logo} src={logoLight} />
<SVG
className={classes.logo}
src={isDark ? logoDark : logoLight}
/>
{menuItems.map(menuItem => {
if (
menuItem.permission &&