diff options
| author | Jacob Thornton <[email protected]> | 2012-08-20 16:13:46 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-08-20 16:13:46 -0700 |
| commit | 5d63e8e2a84468351b4c1ee6cc21f48e95ea27bf (patch) | |
| tree | 2d760c794e61c15850d14d5eee1c565ab4f9a871 /less/progress-bars.less | |
| parent | 5df1e2c00a295c45db7fa75dba333dc9464b128c (diff) | |
| parent | aa2cec6f2f706f8c1754f8bf79a8c9f094445bd8 (diff) | |
| download | bootstrap-5d63e8e2a84468351b4c1ee6cc21f48e95ea27bf.tar.xz bootstrap-5d63e8e2a84468351b4c1ee6cc21f48e95ea27bf.zip | |
fMerge branch '2.1.0-wip'
Conflicts:
docs/index.html
Diffstat (limited to 'less/progress-bars.less')
| -rw-r--r-- | less/progress-bars.less | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/less/progress-bars.less b/less/progress-bars.less index 3b47e6482..36744d89c 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -1,5 +1,6 @@ -// PROGRESS BARS -// ------------- +// +// Progress bars +// -------------------------------------------------- // ANIMATIONS @@ -43,8 +44,8 @@ // Outer container .progress { overflow: hidden; - height: 18px; - margin-bottom: 18px; + height: @baseLineHeight; + margin-bottom: @baseLineHeight; #gradient > .vertical(#f5f5f5, #f9f9f9); .box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); .border-radius(4px); @@ -53,8 +54,9 @@ // Bar of progress .progress .bar { width: 0%; - height: 18px; + height: 100%; color: @white; + float: left; font-size: 12px; text-align: center; text-shadow: 0 -1px 0 rgba(0,0,0,.25); @@ -63,6 +65,9 @@ .box-sizing(border-box); .transition(width .6s ease); } +.progress .bar + .bar { + .box-shadow(~"inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)"); +} // Striped bars .progress-striped .bar { @@ -85,33 +90,33 @@ // ------ // Danger (red) -.progress-danger .bar { +.progress-danger .bar, .progress .bar-danger { #gradient > .vertical(#ee5f5b, #c43c35); } -.progress-danger.progress-striped .bar { +.progress-danger.progress-striped .bar, .progress-striped .bar-danger { #gradient > .striped(#ee5f5b); } // Success (green) -.progress-success .bar { +.progress-success .bar, .progress .bar-success { #gradient > .vertical(#62c462, #57a957); } -.progress-success.progress-striped .bar { +.progress-success.progress-striped .bar, .progress-striped .bar-success { #gradient > .striped(#62c462); } // Info (teal) -.progress-info .bar { +.progress-info .bar, .progress .bar-info { #gradient > .vertical(#5bc0de, #339bb9); } -.progress-info.progress-striped .bar { +.progress-info.progress-striped .bar, .progress-striped .bar-info { #gradient > .striped(#5bc0de); } // Warning (orange) -.progress-warning .bar { +.progress-warning .bar, .progress .bar-warning { #gradient > .vertical(lighten(@orange, 15%), @orange); } -.progress-warning.progress-striped .bar { +.progress-warning.progress-striped .bar, .progress-striped .bar-warning { #gradient > .striped(lighten(@orange, 15%)); } |