mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-26 14:54:27 +02:00
Code Issues Releases Wiki Activity

fixes #18115: move forward with one naming scheme for inversed color schemes, renaming .navbar-dark to .navbar-inverse (matching .card-inverse in the process and restoring v3's inverted class name)

Browse Source
This commit is contained in:
Mark Otto
2016-12-21 21:40:26 -08:00
committed by Mark Otto
parent ecba56828d
commit 80674b0c58
14 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scss/_navbar.scss
View File

@@ -177,26 +177,26 @@
}
// White links against a dark background
.navbar-dark {
.navbar-inverse {
.navbar-brand,
.navbar-toggler {
color: $navbar-dark-active-color;
color: $navbar-inverse-active-color;
@include hover-focus {
color: $navbar-dark-active-color;
color: $navbar-inverse-active-color;
}
}
.navbar-nav {
.nav-link {
color: $navbar-dark-color;
color: $navbar-inverse-color;
@include hover-focus {
color: $navbar-dark-hover-color;
color: $navbar-inverse-hover-color;
}
&.disabled {
color: $navbar-dark-disabled-color;
color: $navbar-inverse-disabled-color;
}
}
@@ -205,14 +205,14 @@
.nav-link.open,
.nav-link.active {
@include plain-hover-focus {
color: $navbar-dark-active-color;
color: $navbar-inverse-active-color;
}
}
}
.navbar-toggler {
background-image: $navbar-dark-toggler-bg;
border-color: $navbar-dark-toggler-border;
background-image: $navbar-inverse-toggler-bg;
border-color: $navbar-inverse-toggler-border;
}
.navbar-divider {
@@ -220,7 +220,7 @@
}
.navbar-text {
color: $navbar-dark-color;
color: $navbar-inverse-color;
}
}

12
scss/_variables.scss
View File

@@ -596,12 +596,12 @@ $navbar-toggler-padding-y: .5rem !default;
$navbar-toggler-font-size: $font-size-lg !default;
$navbar-toggler-border-radius: $btn-border-radius !default;
$navbar-dark-color: rgba(255,255,255,.5) !default;
$navbar-dark-hover-color: rgba(255,255,255,.75) !default;
$navbar-dark-active-color: rgba(255,255,255,1) !default;
$navbar-dark-disabled-color: rgba(255,255,255,.25) !default;
$navbar-dark-toggler-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-dark-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E"), "#", "%23") !default;
$navbar-dark-toggler-border: rgba(255,255,255,.1) !default;
$navbar-inverse-color: rgba(255,255,255,.5) !default;
$navbar-inverse-hover-color: rgba(255,255,255,.75) !default;
$navbar-inverse-active-color: rgba(255,255,255,1) !default;
$navbar-inverse-disabled-color: rgba(255,255,255,.25) !default;
$navbar-inverse-toggler-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-inverse-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E"), "#", "%23") !default;
$navbar-inverse-toggler-border: rgba(255,255,255,.1) !default;
$navbar-light-color: rgba(0,0,0,.5) !default;
$navbar-light-hover-color: rgba(0,0,0,.7) !default;