diff options
| author | Mark Otto <[email protected]> | 2016-12-28 00:03:06 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-12-28 15:13:43 -0800 |
| commit | d6fa9f5a6c520c00c1106be67e65c65b60fce68c (patch) | |
| tree | e011c1857ec0d572df224517155e7fa93df48dfb | |
| parent | e38c3506e3e0108562e6774afed167549bff0a99 (diff) | |
| download | bootstrap-d6fa9f5a6c520c00c1106be67e65c65b60fce68c.tar.xz bootstrap-d6fa9f5a6c520c00c1106be67e65c65b60fce68c.zip | |
Remove plain-hover-focus mixins from navs
- No need to set hover and focus on disabled or active elements. Disabled has no interactivity and active will inherit the focus.
- Also removes two now unused vars.
| -rw-r--r-- | scss/_nav.scss | 31 | ||||
| -rw-r--r-- | scss/_variables.scss | 2 |
2 files changed, 10 insertions, 23 deletions
diff --git a/scss/_nav.scss b/scss/_nav.scss index 98f3957a6..c6fae6131 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -21,12 +21,7 @@ // Disabled state lightens text and removes hover/tab effects &.disabled { color: $nav-disabled-link-color; - - @include plain-hover-focus { - color: $nav-disabled-link-hover-color; - cursor: $cursor-disabled; - background-color: $nav-disabled-link-hover-bg; - } + cursor: $cursor-disabled; } } @@ -51,21 +46,17 @@ } &.disabled { - @include plain-hover-focus { - color: $nav-disabled-link-color; - background-color: transparent; - border-color: transparent; - } + color: $nav-disabled-link-color; + background-color: transparent; + border-color: transparent; } } .nav-link.active, .nav-item.open .nav-link { - @include plain-hover-focus { - 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-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; } .dropdown-menu { @@ -88,11 +79,9 @@ .nav-link.active, .nav-item.open .nav-link { - @include plain-hover-focus { - color: $nav-pills-active-link-color; - cursor: default; - background-color: $nav-pills-active-link-bg; - } + color: $nav-pills-active-link-color; + cursor: default; + background-color: $nav-pills-active-link-bg; } } diff --git a/scss/_variables.scss b/scss/_variables.scss index e6cbf63bf..9acf61827 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -638,8 +638,6 @@ $nav-item-inline-spacer: 1rem !default; $nav-link-padding: .5em 1em !default; $nav-link-hover-bg: $gray-lighter !default; $nav-disabled-link-color: $gray-light !default; -$nav-disabled-link-hover-color: $gray-light !default; -$nav-disabled-link-hover-bg: transparent !default; $nav-tabs-border-color: #ddd !default; $nav-tabs-border-width: $border-width !default; |