Skip to content

Commit 210a608

Browse files
committed
Fix gutter
1 parent 91e19c7 commit 210a608

2 files changed

Lines changed: 26 additions & 24 deletions

File tree

scss/_components.nav.scss

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ $nav-gutter: $spacing-stack-md !default;
55
$nav-hover-color: $grey-dark !default;
66
$nav-active-color: $color-primary !default;
77

8-
$nav-tabs-line-color: $grey-weak !default;
8+
$nav-font-size-sm: $text-size-sm !default;
9+
$nav-font-size-md: $text-size-md !default;
10+
911
$nav-tabs-gutter: $spacing-stack-xs !default;
1012
$nav-tabs-padding: 0.375em 0.75em !default;
1113
$nav-tabs-border-width: $shape-border-width !default;
14+
$nav-tabs-underline-color: $grey-weak !default;
1215
$nav-tabs-hover-color: $grey-dark !default;
1316
$nav-tabs-hover-border-color: $grey-dark !default;
1417
$nav-tabs-active-color: $color-primary !default;
@@ -23,19 +26,17 @@ $nav-pills-active-color: invert-color($color-primary) !default;
2326

2427
.nav {
2528
position: relative;
26-
margin: 0;
29+
margin: 0 (0 - $nav-gutter / 2);
2730
padding: 0;
2831
list-style: none;
2932
display: flex;
30-
font-size: $text-size-md;
33+
font-size: $nav-font-size-md;
3134
}
3235

3336
.nav__item {
3437
position: relative;
35-
36-
&:not(:last-child) {
37-
margin: 0 $nav-gutter 0 0;
38-
}
38+
padding-left: $nav-gutter / 2;
39+
padding-right: $nav-gutter / 2;
3940
}
4041

4142
.nav__link {
@@ -65,11 +66,7 @@ $nav-pills-active-color: invert-color($color-primary) !default;
6566

6667
// size modifiers
6768
.nav.nav--sm {
68-
font-size: $text-size-sm;
69-
}
70-
71-
.nav.nav--lg {
72-
font-size: $text-size-lg;
69+
font-size: $nav-font-size-sm;
7370
}
7471

7572
// layout modifiers
@@ -94,10 +91,12 @@ $nav-pills-active-color: invert-color($color-primary) !default;
9491

9592
// variant modifiers
9693
.nav.nav--pills {
94+
margin-left: 0 - $nav-pills-gutter / 2;
95+
margin-right: 0 - $nav-pills-gutter / 2;
96+
9797
> .nav__item {
98-
&:not(:last-child) {
99-
margin-right: $nav-pills-gutter;
100-
}
98+
padding-left: $nav-pills-gutter / 2;
99+
padding-right: $nav-pills-gutter / 2;
101100

102101
> .nav__link {
103102
padding: $nav-pills-padding;
@@ -118,12 +117,13 @@ $nav-pills-active-color: invert-color($color-primary) !default;
118117
}
119118

120119
.nav.nav--tabs {
121-
border-bottom: $nav-tabs-border-width solid $nav-tabs-line-color;
120+
margin-left: 0 - $nav-tabs-gutter / 2;
121+
margin-right: 0 - $nav-tabs-gutter / 2;
122+
border-bottom: $nav-tabs-border-width solid $nav-tabs-underline-color;
122123

123124
> .nav__item {
124-
&:not(:last-child) {
125-
margin-right: $nav-tabs-gutter;
126-
}
125+
padding-left: $nav-tabs-gutter / 2;
126+
padding-right: $nav-tabs-gutter / 2;
127127

128128
> .nav__link {
129129
padding: $nav-tabs-padding;

scss/_components.navbar.scss

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ $navbar-dark-color: $white !default;
1414
flex-wrap: wrap;
1515
align-items: center;
1616
justify-content: space-between;
17+
margin-left: 0 - $navbar-item-gutter / 2;
18+
margin-right: 0 - $navbar-item-gutter / 2;
1719
}
1820

1921
.navbar__start {
@@ -42,10 +44,8 @@ $navbar-dark-color: $white !default;
4244
position: relative;
4345
color: $navbar-color;
4446
font-size: $navbar-font-size;
45-
46-
&:not(:last-child) {
47-
margin-right: $navbar-item-gutter;
48-
}
47+
padding-left: $navbar-item-gutter / 2;
48+
padding-right: $navbar-item-gutter / 2;
4949
}
5050

5151
.navbar__link {
@@ -66,7 +66,9 @@ $navbar-dark-color: $white !default;
6666
font-size: $navbar-font-size * 1.25;
6767
line-height: $line-height-tight;
6868
color: $navbar-color;
69-
margin-right: $navbar-item-gutter * 1.25;
69+
padding-left: $navbar-item-gutter / 2;
70+
padding-right: $navbar-item-gutter / 2;
71+
margin-right: $navbar-item-gutter / 2;
7072
}
7173

7274
// modifier - dark

0 commit comments

Comments
 (0)