Commit 496f9c2d authored by Chris Rebert's avatar Chris Rebert
Browse files

Merge pull request #18822 from twbs/progress-box-shadow

Add $progress-box-shadow variable
/fyi @mdo
parents f646ed79 46c9f4b1
Showing with 4 additions and 3 deletions
+4 -3
...@@ -59,13 +59,13 @@ ...@@ -59,13 +59,13 @@
.progress[value]::-webkit-progress-bar { .progress[value]::-webkit-progress-bar {
background-color: $progress-bg; background-color: $progress-bg;
@include border-radius($border-radius); @include border-radius($border-radius);
@include box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1)); @include box-shadow($progress-box-shadow);
} }
base::-moz-progress-bar, // Absurd-but-syntactically-valid selector to make these styles Firefox-only base::-moz-progress-bar, // Absurd-but-syntactically-valid selector to make these styles Firefox-only
.progress[value] { .progress[value] {
background-color: $progress-bg; background-color: $progress-bg;
@include border-radius($border-radius); @include border-radius($border-radius);
@include box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1)); @include box-shadow($progress-box-shadow);
} }
// IE9 hacks to accompany custom markup. We don't need to scope this via media queries, but I feel better doing it anyway. // IE9 hacks to accompany custom markup. We don't need to scope this via media queries, but I feel better doing it anyway.
...@@ -73,7 +73,7 @@ base::-moz-progress-bar, // Absurd-but-syntactically-valid selector to make thes ...@@ -73,7 +73,7 @@ base::-moz-progress-bar, // Absurd-but-syntactically-valid selector to make thes
.progress { .progress {
background-color: $progress-bg; background-color: $progress-bg;
@include border-radius($border-radius); @include border-radius($border-radius);
@include box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1)); @include box-shadow($progress-box-shadow);
} }
.progress-bar { .progress-bar {
display: inline-block; display: inline-block;
......
...@@ -575,6 +575,7 @@ $alert-danger-border: $state-danger-border !default; ...@@ -575,6 +575,7 @@ $alert-danger-border: $state-danger-border !default;
$progress-bg: #eee !default; $progress-bg: #eee !default;
$progress-bar-color: #0074d9 !default; $progress-bar-color: #0074d9 !default;
$progress-border-radius: $border-radius !default; $progress-border-radius: $border-radius !default;
$progress-box-shadow: inset 0 .1rem .1rem rgba(0,0,0,.1) !default;
$progress-bar-bg: $brand-primary !default; $progress-bar-bg: $brand-primary !default;
$progress-bar-success-bg: $brand-success !default; $progress-bar-success-bg: $brand-success !default;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment