Skip to content

Use nested scss in nav and footer styles #4006

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

Merged
merged 2 commits into from
Feb 26, 2025
+46 −50
Merged

Use nested scss in nav and footer styles #4006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fb6e07
Use nested scss in nav and footer styles
parlough Feb 20, 2025
dc84e96
Merge branch 'main' into misc/footer-header-navbar-scss
parlough Feb 26, 2025
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 lib/resources/styles.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web/sig.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
318ACAF85024D323F3F60B8D63B1EC23
FBB2C1241F0FD138D012004E4AA98F0E
2 changes: 0 additions & 2 deletions web/styles/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ body {
display: flex;
flex-direction: column;
-webkit-overflow-scrolling: touch;
}

body {
-webkit-text-size-adjust: 100%;
overflow-x: hidden;
font-family: Roboto, sans-serif;
Expand Down
28 changes: 13 additions & 15 deletions web/styles/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,25 @@ footer {
flex: 0 0 16px;
text-align: center;
padding: 16px 20px;
}

footer {
color: #fff;
background-color: var(--main-footer-background);
width: 100%;
}

footer p {
margin: 0;
}
p {
margin: 0;
}

footer .no-break {
white-space: nowrap;
}
.no-break {
white-space: nowrap;
}

footer .container {
padding-left: 0;
padding-right: 0;
}
.container {
padding-left: 0;
padding-right: 0;
}

footer a, footer a:hover {
color: #fff;
a, a:hover {
color: #fff;
}
}
34 changes: 17 additions & 17 deletions web/styles/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@ header {
padding-left: 30px;
padding-right: 30px;
background-color: var(--main-header-color);
}

header ol {
list-style: none;
margin: 0;
padding: 0;
}
ol {
list-style: none;
margin: 0;
padding: 0;

header ol li {
display: inline;
}
li {
display: inline;
}
}

header form {
display: flex;
flex: 1;
justify-content: flex-end;
}
form {
display: flex;
flex: 1;
justify-content: flex-end;
}

header#header-search-sidebar {
height: 50px;
margin-bottom: 25px;
#header-search-sidebar {
height: 50px;
margin-bottom: 25px;
}
}
28 changes: 14 additions & 14 deletions web/styles/_navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.

nav.navbar {
background-color: inherit;
min-height: 50px;
border: 0;
}
nav {
.navbar {
background-color: inherit;
min-height: 50px;
border: 0;

nav.navbar .row {
padding-top: 8px;
}
.row {
padding-top: 8px;
}
}

nav .container {
white-space: nowrap;
}
.container {
white-space: nowrap;

@media(max-width: 840px) {
nav .container {
width: 100%
@media(max-width: 840px) {
width: 100%;
}
}
}