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

Jump to bottom

2321: Added minimum space between navigation tiles and toolbar #2489

Merged
merged 4 commits into from
Dec 8, 2023
Merged

2321: Added minimum space between navigation tiles and toolbar #2489

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db27e53
2321: reset the branch to commit id 2bf3a5682d27d4 and added the sugg…
relentless95 Dec 7, 2023
b687bae
2321: ran prettier to format the code
relentless95 Dec 8, 2023
0d4dfd8
Merge branch 'main' into 2321-minimum-space-btw-navtiles
relentless95 Dec 8, 2023
73e3d69
Merge branch 'main' into 2321-minimum-space-btw-navtiles
relentless95 Dec 8, 2023
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
5 changes: 3 additions & 2 deletions web/src/components/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import styled, { css } from 'styled-components'
import dimensions from '../constants/dimensions'
import useWindowDimensions from '../hooks/useWindowDimensions'

const additionalToolbarTopSpacing = 32

export const RichLayout = styled.div`
position: relative;
display: flex;
Expand Down Expand Up @@ -91,13 +93,12 @@ const Main = styled.main<{ fullWidth: boolean }>`
`

const Aside = styled.aside<{ languageSelectorHeight: number }>`
top: ${props => props.languageSelectorHeight + dimensions.headerHeightLarge}px;
top: ${props => props.languageSelectorHeight + dimensions.headerHeightLarge + additionalToolbarTopSpacing}px;
margin-top: ${props => props.languageSelectorHeight - dimensions.navigationMenuHeight}px;
display: inline-block;
position: sticky;
width: ${dimensions.toolbarWidth}px;
vertical-align: top;
transition: top 0.2s ease-in-out;
steffenkleinle marked this conversation as resolved.
Show resolved Hide resolved
z-index: 10;

&:empty {
Expand Down