Skip to content

Commit

Permalink
[WIP] playing with grids
Browse files Browse the repository at this point in the history
  • Loading branch information
Matushl committed Nov 12, 2023
1 parent d494a90 commit f363559
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 8 deletions.
6 changes: 2 additions & 4 deletions src/components/PageLayout/Banner/Banner.module.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
.banner{
position: fixed;
width: 100vw;
top: 10rem;
left: 0;
height: 2rem;
background-color: black;
color: white;
border: none;
display: flex;
align-items: center;
padding: 0px;
z-index: 2;
z-index: 3;
margin-bottom: 2rem;
}


Expand Down
2 changes: 0 additions & 2 deletions src/components/PageLayout/PageLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {FC, ReactNode, useEffect} from 'react'

import {PageTitleContainer} from '@/utils/PageTitleContainer'

import {Banner} from './Banner/Banner'
import {Footer} from './Footer/Footer'
import {MenuMain} from './MenuMain/MenuMain'
import styles from './PageLayout.module.scss'
Expand All @@ -28,7 +27,6 @@ export const PageLayout: FC<PageLayoutProps> = ({contentWidth = 2, title = '', c
return (
<div className={styles.pageContainer}>
<TopGrid title={pageTitle} />
<Banner />
<MenuMain />
<div className={styles.grid}>
<StromLogo />
Expand Down
13 changes: 11 additions & 2 deletions src/components/PageLayout/TopGrid/TopGrid.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
top: 0;
left: 0;
right: 0;
height: 10rem;
height: auto;
background-color: white;
z-index: 3;
display: grid;
grid-template: 1fr 1fr / 1fr 2fr 1fr;
grid-template: 1fr 1fr auto / 1fr 2fr 1fr;
}

.menu {
Expand All @@ -27,6 +27,15 @@
align-items: center;
}

.baner {

This comment has been minimized.

Copy link
@rtrembecky

rtrembecky Nov 12, 2023

Collaborator

bejnr

// third row
grid-row: 3;
grid-column: 1/4;
display: flex;
justify-content: flex-end;
}


.semesterPicker {
// second row right column
grid-row: 2;
Expand Down
1 change: 1 addition & 0 deletions src/components/PageLayout/TopGrid/TopGrid.module.scss.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export type Styles = {
active: string
baner: string
container: string
menu: string
menuItem: string
Expand Down
4 changes: 4 additions & 0 deletions src/components/PageLayout/TopGrid/TopGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {FC} from 'react'
import {SemesterPicker} from '@/components/SemesterPicker/SemesterPicker'
import {useSeminarInfo} from '@/utils/useSeminarInfo'

import {Banner} from '../Banner/Banner'
import styles from './TopGrid.module.scss'

type TopGridProps = {
Expand Down Expand Up @@ -46,6 +47,9 @@ export const TopGrid: FC<TopGridProps> = ({title}) => {
<SemesterPicker page={page} />
</div>
)}
<div className={styles.baner}>
<Banner />
</div>
</div>
)
}

0 comments on commit f363559

Please sign in to comment.