diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2017-03-18 22:08:55 -0400 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2017-03-18 22:08:55 -0400 |
| commit | f5cc59145642d78d7abbdf38fee1905786da5367 (patch) | |
| tree | 94e9454a55f9a55353a0ade4bebb7935d03e7da1 /scss/_nav.scss | |
| parent | 4ab576a41941b720e2f6fa77724203f66a1d3a17 (diff) | |
| parent | 192a8af0dfcdb5d64a5f273b804011bdcd5d2436 (diff) | |
| download | bootstrap-f5cc59145642d78d7abbdf38fee1905786da5367.tar.xz bootstrap-f5cc59145642d78d7abbdf38fee1905786da5367.zip | |
Merge branch 'twbs/v4-dev' into dropdown-keyboard
Diffstat (limited to 'scss/_nav.scss')
| -rw-r--r-- | scss/_nav.scss | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scss/_nav.scss b/scss/_nav.scss index eb316bb27..7d902a7c0 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -5,6 +5,7 @@ .nav { display: flex; + flex-wrap: wrap; padding-left: 0; margin-bottom: 0; list-style: none; @@ -54,9 +55,9 @@ .nav-link.active, .nav-item.show .nav-link { - color: $nav-tabs-active-link-hover-color; - background-color: $nav-tabs-active-link-hover-bg; - border-color: $nav-tabs-active-link-hover-border-color $nav-tabs-active-link-hover-border-color $nav-tabs-active-link-hover-bg; + color: $nav-tabs-active-link-color; + background-color: $nav-tabs-active-link-bg; + border-color: $nav-tabs-active-link-border-color $nav-tabs-active-link-border-color $nav-tabs-active-link-bg; } .dropdown-menu { @@ -80,7 +81,6 @@ .nav-link.active, .nav-item.show .nav-link { color: $nav-pills-active-link-color; - cursor: default; background-color: $nav-pills-active-link-bg; } } |