From 5a18638f26b4fc876ddd596aad7611637f672484 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 21 Dec 2015 10:45:55 -0700 Subject: [PATCH 1/4] Set $progress-bar-color to color we are currently using --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 20a57bfcb7..380569f426 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -582,7 +582,7 @@ $alert-danger-border: $state-danger-border !default; // Progress bars $progress-bg: #f5f5f5 !default; -$progress-bar-color: #fff !default; +$progress-bar-color: #0074d9 !default; $progress-border-radius: $border-radius !default; $progress-bar-bg: $brand-primary !default; From 0917b04711d4b0f1c55524d9ee5fe68593fd372f Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 21 Dec 2015 10:46:33 -0700 Subject: [PATCH 2/4] Actually use $progress-bar-color instead of hardcoded color Refs #18535 --- scss/_progress.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scss/_progress.scss b/scss/_progress.scss index 15040518d9..9c633a525a 100644 --- a/scss/_progress.scss +++ b/scss/_progress.scss @@ -29,7 +29,7 @@ @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; } @@ -39,7 +39,7 @@ @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; } @@ -59,7 +59,7 @@ // .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; // } @@ -86,7 +86,7 @@ display: inline-block; height: $spacer-y; text-indent: -999rem; // Simulate hiding of value as in native `` - background-color: #0074d9; + background-color: $progress-bar-color; border-top-left-radius: $border-radius; border-bottom-left-radius: $border-radius; } From c6a276dd749ee77500dd2c701e225781abcdd8e5 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 21 Dec 2015 10:51:44 -0700 Subject: [PATCH 3/4] Set $progress-bg to color we are actually using --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 380569f426..88afa3ccd3 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -581,7 +581,7 @@ $alert-danger-border: $state-danger-border !default; // Progress bars -$progress-bg: #f5f5f5 !default; +$progress-bg: #eee !default; $progress-bar-color: #0074d9 !default; $progress-border-radius: $border-radius !default; From 646580a9195246b42af3a52a54ae07c7a5092513 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 21 Dec 2015 10:52:03 -0700 Subject: [PATCH 4/4] Actually use $progress-bg instead of hardcoded color Refs #18535 [skip sauce] --- scss/_progress.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scss/_progress.scss b/scss/_progress.scss index 9c633a525a..b18695f98b 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 @@ -34,7 +34,7 @@ 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)); } @@ -54,7 +54,7 @@ // // $-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)); // } @@ -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)); }