diff options
| author | Mark Otto <[email protected]> | 2017-06-25 18:29:43 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-06-25 18:29:43 -0700 |
| commit | 36e482ed2728eec37188b5ec486283334bb3034f (patch) | |
| tree | e1a288cfc8531874814b8aaf7cdf004d7a3c6e5b /scss | |
| parent | 2392047a0ccc270897c3c451e9646e81a4ff3035 (diff) | |
| download | bootstrap-36e482ed2728eec37188b5ec486283334bb3034f.tar.xz bootstrap-36e482ed2728eec37188b5ec486283334bb3034f.zip | |
update navbars to rename .navbar-inverse to .navbar-dark, update all navbar examples and variables
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_navbar.scss | 22 | ||||
| -rw-r--r-- | scss/_variables.scss | 12 |
2 files changed, 17 insertions, 17 deletions
diff --git a/scss/_navbar.scss b/scss/_navbar.scss index 7012460dd..ab238e56b 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -242,25 +242,25 @@ } // White links against a dark background -.navbar-inverse { +.navbar-dark { .navbar-brand { - color: $navbar-inverse-active-color; + color: $navbar-dark-active-color; @include hover-focus { - color: $navbar-inverse-active-color; + color: $navbar-dark-active-color; } } .navbar-nav { .nav-link { - color: $navbar-inverse-color; + color: $navbar-dark-color; @include hover-focus { - color: $navbar-inverse-hover-color; + color: $navbar-dark-hover-color; } &.disabled { - color: $navbar-inverse-disabled-color; + color: $navbar-dark-disabled-color; } } @@ -268,20 +268,20 @@ .active > .nav-link, .nav-link.show, .nav-link.active { - color: $navbar-inverse-active-color; + color: $navbar-dark-active-color; } } .navbar-toggler { - color: $navbar-inverse-color; - border-color: $navbar-inverse-toggler-border-color; + color: $navbar-dark-color; + border-color: $navbar-dark-toggler-border-color; } .navbar-toggler-icon { - background-image: $navbar-inverse-toggler-icon-bg; + background-image: $navbar-dark-toggler-icon-bg; } .navbar-text { - color: $navbar-inverse-color; + color: $navbar-dark-color; } } diff --git a/scss/_variables.scss b/scss/_variables.scss index 864e0c530..af7404e98 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -600,12 +600,12 @@ $navbar-toggler-padding-x: .75rem !default; $navbar-toggler-font-size: $font-size-lg !default; $navbar-toggler-border-radius: $btn-border-radius !default; -$navbar-inverse-color: rgba($white,.5) !default; -$navbar-inverse-hover-color: rgba($white,.75) !default; -$navbar-inverse-active-color: rgba($white,1) !default; -$navbar-inverse-disabled-color: rgba($white,.25) !default; -$navbar-inverse-toggler-icon-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-inverse-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"), "#", "%23") !default; -$navbar-inverse-toggler-border-color: rgba($white,.1) !default; +$navbar-dark-color: rgba($white,.5) !default; +$navbar-dark-hover-color: rgba($white,.75) !default; +$navbar-dark-active-color: rgba($white,1) !default; +$navbar-dark-disabled-color: rgba($white,.25) !default; +$navbar-dark-toggler-icon-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-dark-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"), "#", "%23") !default; +$navbar-dark-toggler-border-color: rgba($white,.1) !default; $navbar-light-color: rgba($black,.5) !default; $navbar-light-hover-color: rgba($black,.7) !default; |