diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2015-12-15 03:27:57 +0300 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2015-12-15 03:27:57 +0300 |
commit | 3c147bbcc977f74c6a2f6c4b15dc479c89aaf2b0 (patch) | |
tree | bf51e27224a61d105d1544be158e63622535c3a3 | |
parent | dc6648900ffe8609188a7bf904bd765a492471b9 (diff) |
rake update[v4-dev]
-rw-r--r-- | assets/stylesheets/bootstrap/_navbar.scss | 6 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_progress.scss | 15 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_variables.scss | 4 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/mixins/_progress.scss | 5 | ||||
-rw-r--r-- | lib/bootstrap/version.rb | 2 | ||||
-rw-r--r-- | templates/project/_bootstrap-variables.scss | 4 |
6 files changed, 26 insertions, 10 deletions
diff --git a/assets/stylesheets/bootstrap/_navbar.scss b/assets/stylesheets/bootstrap/_navbar.scss index ffe133b..5d89436 100644 --- a/assets/stylesheets/bootstrap/_navbar.scss +++ b/assets/stylesheets/bootstrap/_navbar.scss @@ -5,7 +5,7 @@ .navbar { position: relative; - padding: $navbar-padding-vertical $navbar-padding-horizontal; + padding: $navbar-padding-y $navbar-padding-x; @include clearfix; @include media-breakpoint-up(sm) { @@ -89,8 +89,8 @@ width: 1px; padding-top: .425rem; padding-bottom: .425rem; - margin-right: $navbar-padding-horizontal; - margin-left: $navbar-padding-horizontal; + margin-right: $navbar-padding-x; + margin-left: $navbar-padding-x; overflow: hidden; &::before { diff --git a/assets/stylesheets/bootstrap/_progress.scss b/assets/stylesheets/bootstrap/_progress.scss index 61e13b0..382307b 100644 --- a/assets/stylesheets/bootstrap/_progress.scss +++ b/assets/stylesheets/bootstrap/_progress.scss @@ -19,12 +19,19 @@ margin-bottom: $spacer-y; } .progress[value] { - // IE10 uses `color` to set the bar background-color - color: #0074d9; + // Set overall background + background-color: #eee; // Remove Firefox and Opera border border: 0; // Reset the default appearance appearance: none; + // Set overall border radius + @include border-radius($border-radius); +} +.progress[value]::-ms-fill { + background-color: #0074d9; + // Remove right-hand border of value bar from IE10+/Edge + border: 0; } .progress[value]::-webkit-progress-bar { background-color: #eee; @@ -111,6 +118,10 @@ @include gradient-striped(); background-size: $spacer-y $spacer-y; } +.progress-striped[value]::-ms-fill { + @include gradient-striped(); + background-size: $spacer-y $spacer-y; +} // IE9 @media screen and (min-width:0\0) { .progress-bar-striped { diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index 44cc3cb..f02d4a1 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -365,8 +365,8 @@ $zindex-modal: 1050 !default; // Navbar $navbar-border-radius: $border-radius !default; -$navbar-padding-horizontal: $spacer !default; -$navbar-padding-vertical: ($spacer / 2) !default; +$navbar-padding-x: $spacer !default; +$navbar-padding-y: ($spacer / 2) !default; $navbar-dark-color: rgba(255,255,255,.5) !default; $navbar-dark-hover-color: rgba(255,255,255,.75) !default; diff --git a/assets/stylesheets/bootstrap/mixins/_progress.scss b/assets/stylesheets/bootstrap/mixins/_progress.scss index e174141..9622d79 100644 --- a/assets/stylesheets/bootstrap/mixins/_progress.scss +++ b/assets/stylesheets/bootstrap/mixins/_progress.scss @@ -9,6 +9,11 @@ background-color: $color; } + // IE10+, Microsoft Edge + &[value]::-ms-fill { + background-color: $color; + } + // IE9 @media screen and (min-width:0\0) { .progress-bar { diff --git a/lib/bootstrap/version.rb b/lib/bootstrap/version.rb index 7273620..6c8bba4 100644 --- a/lib/bootstrap/version.rb +++ b/lib/bootstrap/version.rb @@ -1,4 +1,4 @@ module Bootstrap VERSION = '4.0.0.alpha3' - BOOTSTRAP_SHA = '48938155eb24b4ccdde09426066869504c6dab3c' + BOOTSTRAP_SHA = '5cb503e6306116bce6de78c8b7436a13db851fab' end diff --git a/templates/project/_bootstrap-variables.scss b/templates/project/_bootstrap-variables.scss index 2ab4f07..474f2e0 100644 --- a/templates/project/_bootstrap-variables.scss +++ b/templates/project/_bootstrap-variables.scss @@ -366,8 +366,8 @@ // Navbar // $navbar-border-radius: $border-radius; -// $navbar-padding-horizontal: $spacer; -// $navbar-padding-vertical: ($spacer / 2); +// $navbar-padding-x: $spacer; +// $navbar-padding-y: ($spacer / 2); // $navbar-dark-color: rgba(255,255,255,.5); // $navbar-dark-hover-color: rgba(255,255,255,.75); |