Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable main menu and fix tree #500

Merged
merged 3 commits into from
Nov 26, 2024
Merged

Enable main menu and fix tree #500

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43c3b05
Display main menu close button
Matushl Nov 24, 2024
95c4633
set currentColor to Strom.svg fill
Matushl Nov 24, 2024
0c2f9d6
Fix tree logo position for pages with banner
Matushl Nov 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/PageLayout/PageLayout.tsx
View file
Open in desktop
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
View file
Open in desktop
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',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mozno sticky, mozno absolute:
https://developer.mozilla.org/en-US/docs/Web/CSS/position#sticky

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tak tento task je primarne o pridani buttonu pre zavretie main menu, vytvoril som dalsie issue co bude mat za ulohu poziciovanie #501

// 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>
)
}
Loading