kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

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

Add $progress-box-shadow variable
/fyi @mdo
This commit is contained in:
Chris Rebert 2016-01-09 15:10:56 -08:00
parent f646ed7920 46c9f4b143
commit 496f9c2da4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scss/_progress.scss
View File

@ -59,13 +59,13 @@
.progress[value]::-webkit-progress-bar {
background-color: $progress-bg;
@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
.progress[value] {
background-color: $progress-bg;
@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.
@ -73,7 +73,7 @@ base::-moz-progress-bar, // Absurd-but-syntactically-valid selector to make thes
.progress {
background-color: $progress-bg;
@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 {
display: inline-block;

1
scss/_variables.scss
View File

@ -575,6 +575,7 @@ $alert-danger-border: $state-danger-border !default;
$progress-bg: #eee !default;
$progress-bar-color: #0074d9 !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-success-bg: $brand-success !default;