New $nav-pills-active-link-* variables

- Renames old and unused $nav-pills-active-link-hover-* for
$nav-pills-active-link-* ones
- Puts those vars to use in place of defaults $component-* vars on nav
pills

diff --git a/scss/_nav.scss b/scss/_nav.scss
index 2c5f5b4c69741413859fc4d65ec6d29e0a03e5e0..55e0fe1dfb6398894284d4c81b0367703698426b 100644 (file)
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -115,9 +115,9 @@
   .nav-link.active,
   .nav-item.open .nav-link {
     @include plain-hover-focus {
-      color: $component-active-color;
+      color: $nav-pills-active-link-color;
       cursor: default;
-      background-color: $component-active-bg;
+      background-color: $nav-pills-active-link-bg;
     }
   }
 }

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 00dc68214f6f0abb48cc5c40aebf5d7afd1c2136..5c1d07c3637273f618abd00a0a55c75fa0f969d8 100644 (file)
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -399,15 +399,15 @@ $nav-disabled-link-hover-bg:    transparent !default;
 $nav-tabs-border-color:                       #ddd !default;
 $nav-tabs-border-width:                       $border-width !default;
 $nav-tabs-link-hover-border-color:            $gray-lighter !default;
-$nav-tabs-active-link-hover-bg:               $body-bg !default;
 $nav-tabs-active-link-hover-color:            $gray !default;
+$nav-tabs-active-link-hover-bg:               $body-bg !default;
 $nav-tabs-active-link-hover-border-color:     #ddd !default;
 $nav-tabs-justified-link-border-color:        #ddd !default;
 $nav-tabs-justified-active-link-border-color: $body-bg !default;
 
-$nav-pills-border-radius:           $border-radius !default;
-$nav-pills-active-link-hover-bg:    $component-active-bg !default;
-$nav-pills-active-link-hover-color: $component-active-color !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;
 
 
 // Pagination