Merge pull request #18536 from twbs/moz-progress

Uncomment Firefox <progress> styles
/fyi @mdo

1 files changed, 30 insertions, 30 deletions

diff --git a/scss/_progress.scss b/scss/_progress.scss
index b18695f98..1687288ad 100644
--- a/scss/_progress.scss
+++ b/scss/_progress.scss
@@ -28,52 +28,52 @@
   // Set overall border radius
   @include border-radius($border-radius);
 }
+
+// Filled-in portion of the bar
 .progress[value]::-ms-fill {
   background-color: $progress-bar-color;
   // Remove right-hand border of value bar from IE10+/Edge
   border: 0;
 }
-.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));
+.progress[value]::-moz-progress-bar {
+  background-color: $progress-bar-color;
+  border-top-left-radius: $border-radius;
+  border-bottom-left-radius: $border-radius;
 }
 .progress[value]::-webkit-progress-value {
   background-color: $progress-bar-color;
   border-top-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 {
   border-top-right-radius: $border-radius;
   border-bottom-right-radius: $border-radius;
 }
 
-// Firefox styles must be entirely separate or it busts Webkit styles.
-//
-// Commented out for now because linter.
-//
-// $-moz-document url-prefix() {
-//   .progress[value] {
-//     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: $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;
-//   }
-// }
+// Unfilled portion of the bar
+.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));
+}
+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));
+}
 
 // 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) {