diff options
| author | Mark Otto <[email protected]> | 2014-06-18 23:32:17 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-06-18 23:32:17 -0700 |
| commit | f685f2a670b03e8eb1c1eabf6a5adb69b34a7cd5 (patch) | |
| tree | f5277b7af969f666eac6e5504a034912ea155224 /dist/css/bootstrap.css | |
| parent | 53d68a099d1e99499a8b473896a7035444491f36 (diff) | |
| parent | a012ba465dcc54fbf91aca61bb87cbba68eec1d4 (diff) | |
| download | bootstrap-f685f2a670b03e8eb1c1eabf6a5adb69b34a7cd5.tar.xz bootstrap-f685f2a670b03e8eb1c1eabf6a5adb69b34a7cd5.zip | |
Merge pull request #13861 from twbs/new_striped_progress_bar_class
Make striped progress bars its own class
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 8650c3f6e..087c2a97c 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4718,14 +4718,16 @@ a.thumbnail.active { -o-transition: width .6s ease; transition: width .6s ease; } -.progress-striped .progress-bar { +.progress-striped .progress-bar, +.progress-bar-striped { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; background-size: 40px 40px; } -.progress.active .progress-bar { +.progress.active .progress-bar, +.progress-bar.active { -webkit-animation: progress-bar-stripes 2s linear infinite; -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; |