aboutsummaryrefslogtreecommitdiff
path: root/scss/_progress.scss
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-12-29 14:56:28 -0800
committerMark Otto <[email protected]>2016-12-30 22:46:00 -0800
commita0141aa38e74108b4b5f805f8af65cb618236823 (patch)
tree43ec28f47f740b3f7d766643a0748b7c011b2d0b /scss/_progress.scss
parent92fa9b2256a303fcf2034da0a11b9831490c4eb4 (diff)
downloadbootstrap-a0141aa38e74108b4b5f805f8af65cb618236823.tar.xz
bootstrap-a0141aa38e74108b4b5f805f8af65cb618236823.zip
Rewrite progress component without <progress> element
- <progress> element didn't allow animation, labels overlaid, multiple bars, etc. - Revamps CSS to use something more similar to v3's implementation - Ditches variant mixin for `bg-` utils - Rebuilds docs to match, including adding a new Height section for customizing that. Only potential remaining todo is adding `.sr-only` instances to within the bar. Unsure if that's necessary.
Diffstat (limited to 'scss/_progress.scss')
-rw-r--r--scss/_progress.scss97
1 files changed, 13 insertions, 84 deletions
diff --git a/scss/_progress.scss b/scss/_progress.scss
index 800138cdc..02e4c3bd2 100644
--- a/scss/_progress.scss
+++ b/scss/_progress.scss
@@ -1,103 +1,32 @@
-//
// Progress animations
-//
-
@keyframes progress-bar-stripes {
- from { background-position: $spacer-y 0; }
+ from { background-position: $progress-height 0; }
to { background-position: 0 0; }
}
-
-//
// Basic progress bar
-//
-
.progress {
- display: block;
- width: 100%;
- height: $spacer-y; // todo: make a new var for this
- margin-bottom: $spacer-y;
+ display: flex;
overflow: hidden; // force rounded corners by cropping it
-}
-.progress[value] {
- // Set overall background
+ font-size: $progress-font-size;
+ line-height: $progress-height;
+ text-align: center;
background-color: $progress-bg;
- // Remove Firefox and Opera border
- border: 0;
- // Reset the default appearance
- appearance: none;
- // Set overall border radius
@include border-radius($progress-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]::-moz-progress-bar {
- background-color: $progress-bar-color;
-}
-.progress[value]::-webkit-progress-value {
- background-color: $progress-bar-color;
+.progress-bar {
+ height: $progress-height;
+ color: $progress-bar-color;
+ background-color: $progress-bar-bg;
}
-// Unfilled portion of the bar
-.progress[value]::-webkit-progress-bar {
- background-color: $progress-bg;
- @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 box-shadow($progress-box-shadow);
-}
-
-
-//
// Striped
-//
-
-.progress-striped[value]::-webkit-progress-value {
+.progress-bar-striped {
@include gradient-striped();
- background-size: $spacer-y $spacer-y;
-}
-.progress-striped[value]::-moz-progress-bar {
- @include gradient-striped();
- background-size: $spacer-y $spacer-y;
-}
-.progress-striped[value]::-ms-fill {
- @include gradient-striped();
- background-size: $spacer-y $spacer-y;
+ background-size: $progress-height $progress-height;
}
-
-//
// Animated
-//
-
-.progress-animated[value]::-webkit-progress-value {
- animation: progress-bar-stripes 2s linear infinite;
-}
-.progress-animated[value]::-moz-progress-bar {
- animation: progress-bar-stripes 2s linear infinite;
-}
-
-
-//
-// Variations
-//
-
-.progress-success {
- @include progress-variant($progress-bar-success-bg);
-}
-.progress-info {
- @include progress-variant($progress-bar-info-bg);
-}
-.progress-warning {
- @include progress-variant($progress-bar-warning-bg);
-}
-.progress-danger {
- @include progress-variant($progress-bar-danger-bg);
+.progress-bar-animated {
+ animation: progress-bar-stripes $progress-bar-animation-timing;
}