From e02597519aaad4643c87a3b9a77a2d0ff10b27ab Mon Sep 17 00:00:00 2001 From: Sean Beyer Date: Fri, 3 Mar 2017 11:15:41 -0800 Subject: [PATCH] Remove 'hover' from nav-tabs-active-link-hover-color et al (#22087) * Remove 'hover' from variable names * Fix indentation in variables --- scss/_nav.scss | 6 +++--- scss/_variables.scss | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scss/_nav.scss b/scss/_nav.scss index caa7ac1c9d..7d902a7c05 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -55,9 +55,9 @@ .nav-link.active, .nav-item.show .nav-link { - 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-color; + background-color: $nav-tabs-active-link-bg; + border-color: $nav-tabs-active-link-border-color $nav-tabs-active-link-border-color $nav-tabs-active-link-bg; } .dropdown-menu { diff --git a/scss/_variables.scss b/scss/_variables.scss index 5b7ceaf286..b4e8e2fa81 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -621,9 +621,9 @@ $nav-tabs-border-color: #ddd !default; $nav-tabs-border-width: $border-width !default; $nav-tabs-border-radius: $border-radius !default; $nav-tabs-link-hover-border-color: $gray-lighter !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-active-link-color: $gray !default; +$nav-tabs-active-link-bg: $body-bg !default; +$nav-tabs-active-link-border-color: #ddd !default; $nav-pills-border-radius: $border-radius !default; $nav-pills-active-link-color: $component-active-color !default;