diff options
| author | Mark Otto <[email protected]> | 2017-06-13 20:15:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-06-13 20:15:42 -0700 |
| commit | 21b874d19dfee091ee64dd4db934850516d2d7b0 (patch) | |
| tree | e6489cd37f8c582fc5b21d23442f7ef5dc469ac9 /scss/_nav.scss | |
| parent | b95aa65c74e59224e97df75eb1a15d956ad31b71 (diff) | |
| parent | d7867377d939a8bb8a645ab3af8a6a650a78fc29 (diff) | |
| download | bootstrap-21b874d19dfee091ee64dd4db934850516d2d7b0.tar.xz bootstrap-21b874d19dfee091ee64dd4db934850516d2d7b0.zip | |
Merge branch 'v4-dev' into form-tweaks
Diffstat (limited to 'scss/_nav.scss')
| -rw-r--r-- | scss/_nav.scss | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scss/_nav.scss b/scss/_nav.scss index 973679eee..b76e3e968 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -21,7 +21,7 @@ // Disabled state lightens text &.disabled { - color: $nav-disabled-link-color; + color: $nav-link-disabled-color; } } @@ -45,7 +45,7 @@ } &.disabled { - color: $nav-disabled-link-color; + color: $nav-link-disabled-color; background-color: transparent; border-color: transparent; } @@ -53,9 +53,9 @@ .nav-link.active, .nav-item.show .nav-link { - 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; + color: $nav-tabs-link-active-color; + background-color: $nav-tabs-link-active-bg; + border-color: $nav-tabs-link-active-border-color $nav-tabs-link-active-border-color $nav-tabs-link-active-bg; } .dropdown-menu { @@ -77,8 +77,8 @@ &.active, .show & { - color: $nav-pills-active-link-color; - background-color: $nav-pills-active-link-bg; + color: $nav-pills-link-active-color; + background-color: $nav-pills-link-active-bg; } } } |