Skip to content

Commit 06233c7

Browse files
authored
Use nested scss in nav and footer styles (#4006)
_Extracted from #3942 for easier review._ Utilize's sass's support for nesting for easier maintainability and readability of styles. No functional changes.
1 parent 4847677 commit 06233c7

File tree

6 files changed

+46
-50
lines changed

6 files changed

+46
-50
lines changed

lib/resources/styles.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/sig.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
318ACAF85024D323F3F60B8D63B1EC23
1+
FBB2C1241F0FD138D012004E4AA98F0E

web/styles/_base.scss

-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ body {
2020
display: flex;
2121
flex-direction: column;
2222
-webkit-overflow-scrolling: touch;
23-
}
2423

25-
body {
2624
-webkit-text-size-adjust: 100%;
2725
overflow-x: hidden;
2826
font-family: Roboto, sans-serif;

web/styles/_footer.scss

+13-15
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,25 @@ footer {
66
flex: 0 0 16px;
77
text-align: center;
88
padding: 16px 20px;
9-
}
109

11-
footer {
1210
color: #fff;
1311
background-color: var(--main-footer-background);
1412
width: 100%;
15-
}
1613

17-
footer p {
18-
margin: 0;
19-
}
14+
p {
15+
margin: 0;
16+
}
2017

21-
footer .no-break {
22-
white-space: nowrap;
23-
}
18+
.no-break {
19+
white-space: nowrap;
20+
}
2421

25-
footer .container {
26-
padding-left: 0;
27-
padding-right: 0;
28-
}
22+
.container {
23+
padding-left: 0;
24+
padding-right: 0;
25+
}
2926

30-
footer a, footer a:hover {
31-
color: #fff;
27+
a, a:hover {
28+
color: #fff;
29+
}
3230
}

web/styles/_header.scss

+17-17
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@ header {
1010
padding-left: 30px;
1111
padding-right: 30px;
1212
background-color: var(--main-header-color);
13-
}
1413

15-
header ol {
16-
list-style: none;
17-
margin: 0;
18-
padding: 0;
19-
}
14+
ol {
15+
list-style: none;
16+
margin: 0;
17+
padding: 0;
2018

21-
header ol li {
22-
display: inline;
23-
}
19+
li {
20+
display: inline;
21+
}
22+
}
2423

25-
header form {
26-
display: flex;
27-
flex: 1;
28-
justify-content: flex-end;
29-
}
24+
form {
25+
display: flex;
26+
flex: 1;
27+
justify-content: flex-end;
28+
}
3029

31-
header#header-search-sidebar {
32-
height: 50px;
33-
margin-bottom: 25px;
30+
#header-search-sidebar {
31+
height: 50px;
32+
margin-bottom: 25px;
33+
}
3434
}

web/styles/_navbar.scss

+14-14
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
nav.navbar {
6-
background-color: inherit;
7-
min-height: 50px;
8-
border: 0;
9-
}
5+
nav {
6+
.navbar {
7+
background-color: inherit;
8+
min-height: 50px;
9+
border: 0;
1010

11-
nav.navbar .row {
12-
padding-top: 8px;
13-
}
11+
.row {
12+
padding-top: 8px;
13+
}
14+
}
1415

15-
nav .container {
16-
white-space: nowrap;
17-
}
16+
.container {
17+
white-space: nowrap;
1818

19-
@media(max-width: 840px) {
20-
nav .container {
21-
width: 100%
19+
@media(max-width: 840px) {
20+
width: 100%;
21+
}
2222
}
2323
}

0 commit comments

Comments
 (0)