diff options
| author | Chris Rebert <[email protected]> | 2015-12-21 11:12:59 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-12-21 11:12:59 -0700 |
| commit | d756e12f7837aff41f279e25f4b280aae5630d5c (patch) | |
| tree | 49cb02a7178d7b6158f3c205a5c6204972e02eaa | |
| parent | 4afc0a3c4a89dcf35af5c5147962b0fdada1bafc (diff) | |
| parent | 646580a9195246b42af3a52a54ae07c7a5092513 (diff) | |
| download | bootstrap-d756e12f7837aff41f279e25f4b280aae5630d5c.tar.xz bootstrap-d756e12f7837aff41f279e25f4b280aae5630d5c.zip | |
Merge pull request #18622 from twbs/fix-18535
Use variables for .progress base colors
/fyi @mdo
| -rw-r--r-- | scss/_progress.scss | 16 | ||||
| -rw-r--r-- | scss/_variables.scss | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/scss/_progress.scss b/scss/_progress.scss index 15040518d..b18695f98 100644 --- a/scss/_progress.scss +++ b/scss/_progress.scss @@ -20,7 +20,7 @@ } .progress[value] { // Set overall background - background-color: #eee; + background-color: $progress-bg; // Remove Firefox and Opera border border: 0; // Reset the default appearance @@ -29,17 +29,17 @@ @include border-radius($border-radius); } .progress[value]::-ms-fill { - background-color: #0074d9; + background-color: $progress-bar-color; // Remove right-hand border of value bar from IE10+/Edge border: 0; } .progress[value]::-webkit-progress-bar { - background-color: #eee; + background-color: $progress-bg; @include border-radius($border-radius); @include box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1)); } .progress[value]::-webkit-progress-value { - background-color: #0074d9; + background-color: $progress-bar-color; border-top-left-radius: $border-radius; border-bottom-left-radius: $border-radius; } @@ -54,12 +54,12 @@ // // $-moz-document url-prefix() { // .progress[value] { -// background-color: #eee; +// background-color: $progress-bg; // .border-radius($border-radius); // .box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1)); // } // .progress[value]::-moz-progress-bar { -// background-color: #0074d9; +// background-color: $progress-bar-color; // border-top-left-radius: $border-radius; // border-bottom-left-radius: $border-radius; // } @@ -78,7 +78,7 @@ // IE9 hacks to accompany custom markup. We don't need to scope this via media queries, but I feel better doing it anyway. @media screen and (min-width:0\0) { .progress { - background-color: #eee; + background-color: $progress-bg; @include border-radius($border-radius); @include box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1)); } @@ -86,7 +86,7 @@ display: inline-block; height: $spacer-y; text-indent: -999rem; // Simulate hiding of value as in native `<progress>` - background-color: #0074d9; + background-color: $progress-bar-color; border-top-left-radius: $border-radius; border-bottom-left-radius: $border-radius; } diff --git a/scss/_variables.scss b/scss/_variables.scss index 20a57bfcb..88afa3ccd 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -581,8 +581,8 @@ $alert-danger-border: $state-danger-border !default; // Progress bars -$progress-bg: #f5f5f5 !default; -$progress-bar-color: #fff !default; +$progress-bg: #eee !default; +$progress-bar-color: #0074d9 !default; $progress-border-radius: $border-radius !default; $progress-bar-bg: $brand-primary !default; |