diff options
| author | Ivan Khalopik <[email protected]> | 2013-05-27 11:06:31 +0300 |
|---|---|---|
| committer | Ivan Khalopik <[email protected]> | 2013-05-27 11:06:31 +0300 |
| commit | 3285f4c3062f4a56eaed2461a3128a2e6a3ba9cc (patch) | |
| tree | 5fa0a3d3556a83cd96147da46e90ae9f361d8efc /less/progress-bars.less | |
| parent | 3c7a43a1f373d0c534476578b96a75ae2e63c985 (diff) | |
| parent | 7cbb1c0452a1d9904f7655aea78644def85b7f2e (diff) | |
| download | bootstrap-3285f4c3062f4a56eaed2461a3128a2e6a3ba9cc.tar.xz bootstrap-3285f4c3062f4a56eaed2461a3128a2e6a3ba9cc.zip | |
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts:
js/bootstrap-collapse.js
Diffstat (limited to 'less/progress-bars.less')
| -rw-r--r-- | less/progress-bars.less | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/less/progress-bars.less b/less/progress-bars.less index e5e6b65a5..e963fa968 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -44,8 +44,8 @@ // Outer container .progress { overflow: hidden; - height: @line-height-base; - margin-bottom: @line-height-base; + height: @line-height-computed; + margin-bottom: @line-height-computed; background-color: @progress-bg; border-radius: @border-radius-base; .box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); @@ -63,7 +63,6 @@ background-color: @progress-bar-bg; .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15)); .transition(width .6s ease); - .backface-visibility(hidden); } // Striped bars |