From fac0c31a27e1d65638c561b254316dd6c0726cc8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 6 Jan 2016 15:50:08 -0800 Subject: [PATCH] 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 --- scss/_nav.scss | 4 ++-- scss/_variables.scss | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scss/_nav.scss b/scss/_nav.scss index 2c5f5b4c69..55e0fe1dfb 100644 --- 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 00dc68214f..5c1d07c363 100644 --- 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