Skip to content

Commit

Permalink
Navbar: shift center block left
Browse files Browse the repository at this point in the history
The navbar links being at the centre made it look very uneven,
especially with the search bar expanding to take up space on the right.
This commit shifts the navbar links to the left, and aligns the padding
of the navbar with the Today, Venues and Timetable components on the
medium viewport widths.
  • Loading branch information
bnjmnt4n committed Feb 15, 2021
1 parent 27ec54c commit 2be0f7a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
9 changes: 3 additions & 6 deletions website/src/views/layout/Navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,12 @@ $logo-vert-padding: 0.875rem;
.brandLogo {
// Explicit width so the logo will not expand
// to occupy the entire navbar
width: 11rem; // Eyeballed number
max-width: 11rem; // Eyeballed number
height: 100%;
padding: $logo-vert-padding $grid-gutter-width/2 $logo-vert-padding $grid-gutter-width;
padding: $logo-vert-padding $grid-gutter-width/2 $logo-vert-padding $grid-gutter-width/2;
}

.navLeft {
display: flex;
flex: 1 0 0;
height: $navbar-height;
}

Expand All @@ -50,7 +48,7 @@ $logo-vert-padding: 0.875rem;
flex: 1 0 0;
justify-content: flex-end;
height: $navbar-height;
padding-right: $grid-gutter-width;
padding-right: $grid-gutter-width / 2;
}

.weekText {
Expand All @@ -67,7 +65,6 @@ $logo-vert-padding: 0.875rem;
}

.navLeft {
flex: unset;
order: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion website/src/views/layout/Navtabs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
flex-grow: 1;
justify-content: center;
align-items: center;
width: 4rem;
min-width: 3rem;
margin: 0 0.2rem;
border-top: 0.2rem solid transparent;
border-bottom: 0.2rem solid transparent;
Expand Down
2 changes: 1 addition & 1 deletion website/src/views/today/TodayContainer/TodayContainer.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '~styles/utils/modules-entry';

$schedule-width: 25rem;
$gutter: 0.75rem;
$gutter: 0.9375rem; // 15px; aligns with $grid-gutter-width / 2.

.todayPage {
composes: page-container from global;
Expand Down

0 comments on commit 2be0f7a

Please sign in to comment.