Skip to content

Commit

Permalink
Enable main menu and fix tree (#500)
Browse files Browse the repository at this point in the history
* Display main menu close button

* set currentColor to Strom.svg fill

* Fix tree logo position for pages with banner
  • Loading branch information
Matushl authored Nov 26, 2024
1 parent b0c972d commit 3c1a731
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 20 deletions.
2 changes: 1 addition & 1 deletion src/components/Crossroad/Crossroad.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const Crossroad: React.FC = () => {
<Grid container disableEqualOverflow columnSpacing={{xs: 2, md: 3, lg: 4}} mt={'30vh'} flexGrow={1}>
<Grid xs={0} md={3} display={{xs: 'none', md: 'flex'}} height="70dvh" justifyContent="end">
<Box>
<Strom width="100%" height="100%" preserveAspectRatio="xMaxYMin" />
<Strom width="100%" height="100%" preserveAspectRatio="xMaxYMin" color="white" />
</Box>
</Grid>
<Grid xs={12} md={9}>
Expand Down
1 change: 0 additions & 1 deletion src/components/PageLayout/MenuMain/MenuMain.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 && (
Expand Down
2 changes: 1 addition & 1 deletion src/components/PageLayout/PageLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const PageLayout: FC<PageLayoutProps> = ({contentWidth = 2, title = '', c
<BannerContainer.Provider>
<Stack sx={{minHeight: '100dvh'}}>
<TopGrid />
<Grid container sx={{flex: 1}}>
<Grid container disableEqualOverflow sx={{flex: 1}}>
<Grid xs={0} md={3} sx={{position: 'relative', display: {xs: 'none', md: 'block'}}}>
<StromLogo />
</Grid>
Expand Down
30 changes: 17 additions & 13 deletions src/components/PageLayout/StromLogo/StromLogo.tsx
Original file line number Diff line number Diff line change
@@ -1,31 +1,35 @@
import {Box} from '@mui/material'
import {FC} from 'react'

import Strom from '@/svg/strom.svg'

export const StromLogo: FC = () => {
return (
<Box
sx={{
position: 'fixed',
// tieto cisla su take dost ad-hoc, ale aj tak ten strom nebude vidno
top: {md: '204px', lg: '186px', xl: '222px'},
// tieto cisla su take dost ad-hoc
// je potrebne doratat este podla toho ze ci sa zobrazuje alebo nezobrazuje baner
// taktiez pri sirke 900 - 1100px sa niektore nadpisy zalomuju a rozbijaju zarovnanie stromu
// - problem toho je ze to je rozlisenie vacsinu tabletov na vysku, takze to bude treba fixnut
top: {md: '213px', lg: '265px', xl: '301px'},
left: 0,
bottom: 0,
width: '25%',
paddingTop: 2,
overflow: 'hidden',
display: 'flex',
flexDirection: 'column',
alignItems: 'end',
zIndex: -1,
}}
>
<Box
sx={{
height: '100%',
width: '100%',
backgroundColor: 'black',
// toto je stary tomaskov stromcek
// clip-path: 'polygon(100% 0%, 100% 100%, 45% 100%, 96% 63%, 55% 63%, 96% 30%, 65% 30%)'
// toto je novy stromcek od Matusa Libaka
clipPath: 'polygon(100% 0, 100% 100%, 90% 100%, 90% 80%, 35% 80%, 90% 35%, 56% 35%)',
}}
/>
<Box>
<Strom width="100%" height="auto" preserveAspectRatio="xMaxYMin" />
</Box>
<Box>
<Strom width="100%" height="auto" preserveAspectRatio="xMaxYMin" />
</Box>
</Box>
)
}
8 changes: 4 additions & 4 deletions src/svg/strom.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3c1a731

Please sign in to comment.