kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

(#22414) Renamed for consistency $nav-disabled-link-color, $nav-tabs-active-link-color, $nav-tabs-active-link-bg, $nav-tabs-active-link-border-color, $nav-pills-active-link-color, $nav-pills-active-link-bg to $nav-link-disabled-color, $nav-tabs-link-active-color, $nav-tabs-link-active-bg, $nav-tabs-link-active-border-color, $nav-pills-link-active-color, $nav-pills-link-active-bg, respectively

Browse source
This commit is contained in:
Patrick Yeo 2017-06-08 20:23:24 -07:00 committed by Mark Otto
parent 5e651615a3
commit 3ecb8b661b
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scss/_nav.scss
View file

@ -21,7 +21,7 @@
// Disabled state lightens text
&.disabled {
color: $nav-disabled-link-color;
color: $nav-link-disabled-color;
}
}
@ -45,7 +45,7 @@
}
&.disabled {
color: $nav-disabled-link-color;
color: $nav-link-disabled-color;
background-color: transparent;
border-color: transparent;
}
@ -53,9 +53,9 @@
.nav-link.active,
.nav-item.show .nav-link {
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;
color: $nav-tabs-link-active-color;
background-color: $nav-tabs-link-active-bg;
border-color: $nav-tabs-link-active-border-color $nav-tabs-link-active-border-color $nav-tabs-link-active-bg;
}
.dropdown-menu {
@ -77,8 +77,8 @@
&.active,
.show & {
color: $nav-pills-active-link-color;
background-color: $nav-pills-active-link-bg;
color: $nav-pills-link-active-color;
background-color: $nav-pills-link-active-bg;
}
}
}

12
scss/_variables.scss
View file

@ -569,19 +569,19 @@ $zindex-tooltip: 1070 !default;
$nav-link-padding-y: .5rem !default;
$nav-link-padding-x: 1rem !default;
$nav-disabled-link-color: $gray-light !default;
$nav-link-disabled-color: $gray-light !default;
$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-color: $gray !default;
$nav-tabs-active-link-bg: $body-bg !default;
$nav-tabs-active-link-border-color: #ddd !default;
$nav-tabs-link-active-color: $gray !default;
$nav-tabs-link-active-bg: $body-bg !default;
$nav-tabs-link-active-border-color: #ddd !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;
$nav-pills-link-active-color: $component-active-color !default;
$nav-pills-link-active-bg: $component-active-bg !default;
// Navbar