Skip to content

Commit 49256f7

Browse files
committed
Updating the Navigation and Page styling to better handle breakpoints
1 parent bdefb33 commit 49256f7

File tree

2 files changed

+31
-12
lines changed

2 files changed

+31
-12
lines changed

components/navigation/navigation-style.scss

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
padding: 0.6em 1em;
3535

3636
@include break {
37+
padding:0 1.5em;
38+
}
39+
40+
@include break('large') {
3741
padding:0 0 0 1.5em;
3842
}
3943
}
@@ -69,21 +73,33 @@
6973
align-items: center;
7074
justify-content: flex-end;
7175
}
76+
77+
@include break('large') {
78+
padding-right:0;
79+
}
7280
}
7381

7482
.navigation__link {
75-
font-size: getFontSize(-1);
76-
padding:1.5em;
77-
text-transform: uppercase;
78-
color: map-get($colors, dusty-grey);
79-
transition:all 250ms;
83+
@include break {
84+
font-size: getFontSize(-1);
85+
text-transform: uppercase;
86+
color: map-get($colors, dusty-grey);
87+
transition:all 250ms;
88+
padding:1.75em 0;
89+
margin-left:1.5em;
90+
}
8091

81-
&:hover,
82-
&--active {
83-
color: map-get($colors, white);
92+
@include break('large') {
93+
padding:1.5em;
94+
margin-left:0;
95+
96+
&--active {
97+
background: map-get($colors, emperor);
98+
}
8499
}
85100

101+
&:hover,
86102
&--active {
87-
background: map-get($colors, emperor);
103+
color: map-get($colors, white);
88104
}
89105
}

components/page/page-style.scss

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@
1010

1111
// XXX: Temporary hack to fix sidebar width
1212
.page div:first-of-type {
13-
flex:0 0 auto;
14-
overflow:auto;
13+
flex: 0 0 auto;
14+
overflow: auto;
1515

1616
@include break {
17+
flex:0 0 30%;
18+
}
19+
20+
@include break('large') {
1721
flex:0 0 25%;
18-
overflow:hidden;
1922
}
2023
}
2124

0 commit comments

Comments
 (0)