From: Mark Otto <markdotto@gmail.com>
Date: Wed, 28 Dec 2016 08:03:06 +0000 (-0800)
Subject: Remove plain-hover-focus mixins from navs
X-Git-Tag: v4.0.0-alpha.6~124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6fa9f5a6c520c00c1106be67e65c65b60fce68c;p=thirdparty%2Fbootstrap.git

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.
---

diff --git a/scss/_nav.scss b/scss/_nav.scss
index 98f3957a6e..c6fae61313 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 e6cbf63bf5..9acf618275 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;