diff options
| author | Patrick Yeo <[email protected]> | 2017-06-08 20:23:24 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-06-13 08:45:21 -0700 |
| commit | 3ecb8b661b8bbdbb2482cd819350c09a0f310af7 (patch) | |
| tree | d645beed667c3a23cc4cf7d27131ca4ca85478ff | |
| parent | 5e651615a3a60c646b6ed90881b6291bdef49208 (diff) | |
| download | bootstrap-3ecb8b661b8bbdbb2482cd819350c09a0f310af7.tar.xz bootstrap-3ecb8b661b8bbdbb2482cd819350c09a0f310af7.zip | |
(#22414) Renamed for consistency `$nav-disabled-link-color`, `$nav-tabs-active-link-color`, `$nav-tabs-active-link-bg`, `$nav-tabs-active-link-border-color`, `$nav-pills-active-link-color`, `$nav-pills-active-link-bg` to `$nav-link-disabled-color`, `$nav-tabs-link-active-color`, `$nav-tabs-link-active-bg`, `$nav-tabs-link-active-border-color`, `$nav-pills-link-active-color`, `$nav-pills-link-active-bg`, respectively
| -rw-r--r-- | scss/_nav.scss | 14 | ||||
| -rw-r--r-- | scss/_variables.scss | 12 |
2 files changed, 13 insertions, 13 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; } } } diff --git a/scss/_variables.scss b/scss/_variables.scss index 3ce512eb1..1643f24e8 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -569,19 +569,19 @@ $zindex-tooltip: 1070 !default; $nav-link-padding-y: .5rem !default; $nav-link-padding-x: 1rem !default; -$nav-disabled-link-color: $gray-light !default; +$nav-link-disabled-color: $gray-light !default; $nav-tabs-border-color: #ddd !default; $nav-tabs-border-width: $border-width !default; $nav-tabs-border-radius: $border-radius !default; $nav-tabs-link-hover-border-color: $gray-lighter !default; -$nav-tabs-active-link-color: $gray !default; -$nav-tabs-active-link-bg: $body-bg !default; -$nav-tabs-active-link-border-color: #ddd !default; +$nav-tabs-link-active-color: $gray !default; +$nav-tabs-link-active-bg: $body-bg !default; +$nav-tabs-link-active-border-color: #ddd !default; $nav-pills-border-radius: $border-radius !default; -$nav-pills-active-link-color: $component-active-color !default; -$nav-pills-active-link-bg: $component-active-bg !default; +$nav-pills-link-active-color: $component-active-color !default; +$nav-pills-link-active-bg: $component-active-bg !default; // Navbar |