Skip to content

Commit b4dc80a

Browse files
committed
navigation tweaks for new tab style btn
1 parent c5dbe19 commit b4dc80a

6 files changed

Lines changed: 102 additions & 33 deletions

File tree

_sass/components/_buttons.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818

1919
.btn--primary {
2020
@include font-smoothing;
21-
border-color: $color-blue;
22-
background: $color-blue;
21+
border-color: #3dbfe4;
22+
//background: $color-blue;
23+
background: linear-gradient(to right, #40c3e3, #3dbfe4) no-repeat;
2324
color: $color-white;
2425

2526
&:hover {

_sass/layout/_page-header.scss

Lines changed: 52 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -174,29 +174,40 @@
174174
@media (min-width: $bp-nav) {
175175
display: inline-block;
176176
margin-bottom: 0;
177+
position: absolute;
178+
right: 0;
177179
}
178180
}
179181

180182
.site-nav__item {
181183
display: block;
182-
padding: rem-calc(0 15);
184+
padding: rem-calc(0 12); // was 0 15
183185

184186
@media (min-width: $bp-nav) {
185187
display: inline-block;
186188
}
189+
190+
&:last-child {
191+
margin-right: 0;
192+
padding-right: 0;
193+
}
187194
}
188195

189196
.site-nav__button.btn--primary {
190197
position: relative;
191-
top: rem-calc(-90);
192-
right: rem-calc(10px);
198+
@media (min-width: $bp-nav) {
199+
top: rem-calc(-84);
200+
right: rem-calc(-10);
201+
border-top-left-radius: 0;
202+
border-top-right-radius: 0;
203+
}
193204
}
194205

195206
.site-nav__actions > .site-nav__item {
196207
padding: rem-calc(0 7);
197208

198209
&:last-child {
199-
//padding-right: 0;
210+
margin-right: 0;
200211
}
201212
}
202213

@@ -219,7 +230,7 @@ right: rem-calc(10px);
219230
.smaller .site-nav__link {
220231
@media (min-width: $bp-nav) {
221232
display: block;
222-
height: rem-calc(75);
233+
height: rem-calc(62);
223234
padding-top: rem-calc(18);
224235
color: $color-white;
225236

@@ -229,6 +240,13 @@ right: rem-calc(10px);
229240
}
230241
}
231242

243+
.smaller .site-nav__item {
244+
&:last-child {
245+
padding-right: 0;
246+
margin-right: 0;
247+
}
248+
}
249+
232250
.smaller .site-nav__button.btn--gradient {
233251
@include at-least(small) {
234252
@include font-smoothing;
@@ -247,15 +265,41 @@ right: rem-calc(10px);
247265
}
248266
}
249267

268+
// .smaller .site-nav__button.btn--primary {
269+
// position: relative;
270+
// top: 0;
271+
// right: 0;
272+
// @include at-least(small) {
273+
// border-color: $color-white;
274+
// background: $color-white;
275+
// color: $color-curious-blue;
276+
// border-top-left-radius: $border-radius;
277+
// border-top-right-radius: $border-radius;
278+
// &:hover {
279+
// @include font-smoothing;
280+
// background: transparent;
281+
// color: $color-white;
282+
// }
283+
// }
284+
// }
285+
250286
.smaller .site-nav__button.btn--primary {
251287
position: relative;
252-
top: 0;
253-
right: 0;
288+
top: 0;
289+
right: 0;
290+
@media (min-width: $bp-nav) {
291+
top: rem-calc(-41);
292+
line-height: 2.25;
293+
right: 0;
294+
height: rem-calc(36);
295+
border: 1px solid $color-white;
296+
border-top-left-radius: 0;
297+
border-top-right-radius: 0;
298+
}
254299
@include at-least(small) {
255300
border-color: $color-white;
256301
background: $color-white;
257302
color: $color-curious-blue;
258-
259303
&:hover {
260304
@include font-smoothing;
261305
background: transparent;

_sass/utils/_variables.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ $color-anakiwa: #78e0ff;
3131
$color-aquamarine: #6bc7e3;
3232

3333

34-
34+
$border-radius: rem-calc(4);
3535
// Font-size scale (Based on http://csswizardry.com/2012/02/pragmatic-practical-font-sizing-in-css/)
3636
// ---------------------------------------------------------------------------
3737

@@ -54,4 +54,4 @@ $font-size-milli: rem-calc(10);
5454
$bp-small: rem-calc(650);
5555
$bp-medium: rem-calc(992);
5656
$bp-large: rem-calc(1200);
57-
$bp-nav: rem-calc(960); // width used for nav menu breakpoints
57+
$bp-nav: rem-calc(970); // width used for nav menu breakpoints

_sass/utils/mixins/_buttons.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020
cursor: pointer;
2121
vertical-align: middle;
2222
user-select: none;
23-
border-radius: rem-calc(4);
23+
border-radius: $border-radius;
2424
}

css/styles.css

Lines changed: 43 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/styles.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)