From: Mark Otto <markdotto@gmail.com>
Date: Tue, 20 Dec 2016 05:06:27 +0000 (-0800)
Subject: Merge branch 'progress-brand' of https://github.com/szastupov/bootstrap into szastupo... 
X-Git-Tag: v4.0.0-alpha.6~318
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50d5f60696208c0e242f72d30b928b12300e3831;p=thirdparty%2Fbootstrap.git

Merge branch 'progress-brand' of https://github.com/szastupov/bootstrap into szastupov-progress-brand
---

50d5f60696208c0e242f72d30b928b12300e3831
diff --cc scss/_variables.scss
index e5add5d18f,a63e1be5e6..9d98b1e709
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@@ -817,7 -807,7 +817,7 @@@ $alert-danger-border:         $state-da
  
  // 27. Progress bars
  
- $progress-bg:                 $gray-lightest !default;
 -$progress-bg:                 #eee !default;
++$progress-bg:                 $gray-lighter !default;
  $progress-bar-color:          $brand-primary !default;
  $progress-border-radius:      $border-radius !default;
  $progress-box-shadow:         inset 0 .1rem .1rem rgba(0,0,0,.1) !default;