diff options
| author | fat <[email protected]> | 2013-05-16 11:08:46 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-05-16 11:08:46 -0700 |
| commit | a4c16155a21c7bcad9b1d52e2141425cdb7df494 (patch) | |
| tree | 490759c71a56d0b54fb46d5ae56851074a31a992 /less/progress-bars.less | |
| parent | 14651035deda4d02a1ca02c6088c34f770f897f6 (diff) | |
| parent | f3d857773455a940fca0c8d2ef1ca26982700031 (diff) | |
| download | bootstrap-a4c16155a21c7bcad9b1d52e2141425cdb7df494.tar.xz bootstrap-a4c16155a21c7bcad9b1d52e2141425cdb7df494.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
Makefile
docs/_site/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.min.js
docs/customize.html
docs/docs.html
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 |