From 3c1a731a1bcce4df74a14dcab40e56c2d0125276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Hlav=C3=A1=C4=8Dik?= Date: Tue, 26 Nov 2024 19:52:22 +0100 Subject: [PATCH] Enable main menu and fix tree (#500) * Display main menu close button * set currentColor to Strom.svg fill * Fix tree logo position for pages with banner --- src/components/Crossroad/Crossroad.tsx | 2 +- .../PageLayout/MenuMain/MenuMain.tsx | 1 - src/components/PageLayout/PageLayout.tsx | 2 +- .../PageLayout/StromLogo/StromLogo.tsx | 30 +++++++++++-------- src/svg/strom.svg | 8 ++--- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/components/Crossroad/Crossroad.tsx b/src/components/Crossroad/Crossroad.tsx index bfe229e5..877c7d41 100644 --- a/src/components/Crossroad/Crossroad.tsx +++ b/src/components/Crossroad/Crossroad.tsx @@ -36,7 +36,7 @@ export const Crossroad: React.FC = () => { - + diff --git a/src/components/PageLayout/MenuMain/MenuMain.tsx b/src/components/PageLayout/MenuMain/MenuMain.tsx index 92cc339b..04c3c6ba 100644 --- a/src/components/PageLayout/MenuMain/MenuMain.tsx +++ b/src/components/PageLayout/MenuMain/MenuMain.tsx @@ -107,7 +107,6 @@ export const MenuMain: FC = () => { top: 24, left: {xs: 'auto', md: 24}, right: {xs: 24, md: 'auto'}, - display: {xs: 'block', md: 'none'}, }} /> {menuItemsIsLoading && ( diff --git a/src/components/PageLayout/PageLayout.tsx b/src/components/PageLayout/PageLayout.tsx index fc315843..d2ba2375 100644 --- a/src/components/PageLayout/PageLayout.tsx +++ b/src/components/PageLayout/PageLayout.tsx @@ -41,7 +41,7 @@ export const PageLayout: FC = ({contentWidth = 2, title = '', c - + diff --git a/src/components/PageLayout/StromLogo/StromLogo.tsx b/src/components/PageLayout/StromLogo/StromLogo.tsx index 904884d3..86edd4f8 100644 --- a/src/components/PageLayout/StromLogo/StromLogo.tsx +++ b/src/components/PageLayout/StromLogo/StromLogo.tsx @@ -1,31 +1,35 @@ import {Box} from '@mui/material' import {FC} from 'react' +import Strom from '@/svg/strom.svg' + export const StromLogo: FC = () => { return ( - + + + + + + ) } diff --git a/src/svg/strom.svg b/src/svg/strom.svg index 2eb53c67..f047f039 100644 --- a/src/svg/strom.svg +++ b/src/svg/strom.svg @@ -1,5 +1,5 @@ - - - - + + + +