aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-01-06 15:50:08 -0800
committerMark Otto <[email protected]>2016-01-06 15:50:08 -0800
commitfac0c31a27e1d65638c561b254316dd6c0726cc8 (patch)
tree0e754f2f518bc60d69aec22130f38ee60bef8315
parent774a2ed37e6ec3bbd1921eacee95cced8c0c542b (diff)
downloadbootstrap-fac0c31a27e1d65638c561b254316dd6c0726cc8.tar.xz
bootstrap-fac0c31a27e1d65638c561b254316dd6c0726cc8.zip
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
-rw-r--r--scss/_nav.scss4
-rw-r--r--scss/_variables.scss8
2 files changed, 6 insertions, 6 deletions
diff --git a/scss/_nav.scss b/scss/_nav.scss
index 2c5f5b4c6..55e0fe1df 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 00dc68214..5c1d07c36 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