aboutsummaryrefslogtreecommitdiff
path: root/scss/_progress.scss
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-05-30 08:46:33 -0700
committerMark Otto <[email protected]>2017-05-30 08:46:33 -0700
commitd4eb0d4e739477fc51421eed29906addfd998a04 (patch)
tree5ffe09c63ac4e522890fc7b2b87c0a47b0f1a971 /scss/_progress.scss
parent0c12ccbeb6fdf0dd3818f97260aa43c79108d377 (diff)
parentf95cbc5950bf31995f33023014c47a61665ffacc (diff)
downloadbootstrap-d4eb0d4e739477fc51421eed29906addfd998a04.tar.xz
bootstrap-d4eb0d4e739477fc51421eed29906addfd998a04.zip
Merge branch 'v4-docs-streamlined' of https://github.com/twbs/bootstrap into v4-docs-streamlined
Diffstat (limited to 'scss/_progress.scss')
-rw-r--r--scss/_progress.scss8
1 files changed, 4 insertions, 4 deletions
diff --git a/scss/_progress.scss b/scss/_progress.scss
index 02e4c3bd2..f7491a64b 100644
--- a/scss/_progress.scss
+++ b/scss/_progress.scss
@@ -1,10 +1,8 @@
-// Progress animations
@keyframes progress-bar-stripes {
from { background-position: $progress-height 0; }
to { background-position: 0 0; }
}
-// Basic progress bar
.progress {
display: flex;
overflow: hidden; // force rounded corners by cropping it
@@ -13,20 +11,22 @@
text-align: center;
background-color: $progress-bg;
@include border-radius($progress-border-radius);
+ @include box-shadow($progress-box-shadow);
}
+
.progress-bar {
height: $progress-height;
+ line-height: $progress-height;
color: $progress-bar-color;
background-color: $progress-bar-bg;
+ @include transition($progress-bar-transition);
}
-// Striped
.progress-bar-striped {
@include gradient-striped();
background-size: $progress-height $progress-height;
}
-// Animated
.progress-bar-animated {
animation: progress-bar-stripes $progress-bar-animation-timing;
}