rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #18536 from twbs/moz-progress

Browse Source 
Uncomment Firefox <progress> styles
/fyi @mdo
This commit is contained in:
Chris Rebert 2015-12-23 23:36:45 -07:00
commit 5cdb092318
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
scss/_progress.scss
View File

@ -28,52 +28,52 @@
// Set overall border radius // Set overall border radius
@include border-radius($border-radius); @include border-radius($border-radius);
} }
// Filled-in portion of the bar
.progress[value]::-ms-fill { .progress[value]::-ms-fill {
background-color: $progress-bar-color; background-color: $progress-bar-color;
// Remove right-hand border of value bar from IE10+/Edge // Remove right-hand border of value bar from IE10+/Edge
border: 0; border: 0;
} }
.progress[value]::-webkit-progress-bar { .progress[value]::-moz-progress-bar {
background-color: $progress-bg; background-color: $progress-bar-color;
@include border-radius($border-radius); border-top-left-radius: $border-radius;
@include box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1)); border-bottom-left-radius: $border-radius;
} }
.progress[value]::-webkit-progress-value { .progress[value]::-webkit-progress-value {
background-color: $progress-bar-color; background-color: $progress-bar-color;
border-top-left-radius: $border-radius; border-top-left-radius: $border-radius;
border-bottom-left-radius: $border-radius; border-bottom-left-radius: $border-radius;
} }
// Tweaks for empty progress bar
.progress[value="0"]::-moz-progress-bar {
min-width: 2rem;
color: $gray-light;
background-color: transparent;
background-image: none;
}
// Tweaks for full progress bar
.progress[value="100"]::-moz-progress-bar {
border-top-right-radius: $border-radius;
border-bottom-right-radius: $border-radius;
}
.progress[value="100"]::-webkit-progress-value { .progress[value="100"]::-webkit-progress-value {
border-top-right-radius: $border-radius; border-top-right-radius: $border-radius;
border-bottom-right-radius: $border-radius; border-bottom-right-radius: $border-radius;
} }
// Firefox styles must be entirely separate or it busts Webkit styles. // Unfilled portion of the bar
// .progress[value]::-webkit-progress-bar {
// Commented out for now because linter. background-color: $progress-bg;
// @include border-radius($border-radius);
// $-moz-document url-prefix() { @include box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1));
// .progress[value] { }
// background-color: $progress-bg; base::-moz-progress-bar, // Absurd-but-syntactically-valid selector to make these styles Firefox-only
// .border-radius($border-radius); .progress[value] {
// .box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1)); background-color: $progress-bg;
// } @include border-radius($border-radius);
// .progress[value]::-moz-progress-bar { @include box-shadow(inset 0 .1rem .1rem rgba(0,0,0,.1));
// background-color: $progress-bar-color; }
// border-top-left-radius: $border-radius;
// border-bottom-left-radius: $border-radius;
// }
// .progress[value="0"]::-moz-progress-bar {
// color: $gray-light;
// min-width: 2rem;
// background-color: transparent;
// background-image: none;
// }
// .progress[value="100"]::-moz-progress-bar {
// border-top-right-radius: $border-radius;
// border-bottom-right-radius: $border-radius;
// }
// }
// 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.
@media screen and (min-width:0\0) { @media screen and (min-width:0\0) {