diff options
| author | Mark Otto <[email protected]> | 2013-05-04 13:11:31 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-05-04 13:11:31 -0700 |
| commit | 49da7d80203544b4b7f613bb963338f7a48772af (patch) | |
| tree | 14db8bf95f6d5779b093f4b5217eb4f16130c63f | |
| parent | dcf7cc084d6b2d0522860c4c9be6e914c67ab91a (diff) | |
| parent | d0e79a36d5d2ca7a9e8c9fb7a96d1ebf1361a5cf (diff) | |
| download | bootstrap-49da7d80203544b4b7f613bb963338f7a48772af.tar.xz bootstrap-49da7d80203544b4b7f613bb963338f7a48772af.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
| -rw-r--r-- | docs/assets/css/bootstrap.css | 3 | ||||
| -rw-r--r-- | less/grid.less | 2 | ||||
| -rw-r--r-- | less/progress-bars.less | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index eba96cb30..67b0bd18e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4896,6 +4896,9 @@ a.list-group-item.active > .badge, -moz-transition: width 0.6s ease; -o-transition: width 0.6s ease; transition: width 0.6s ease; + -webkit-backface-visibility: hidden; + -moz-backface-visibility: hidden; + backface-visibility: hidden; } .progress-striped .progress-bar { diff --git a/less/grid.less b/less/grid.less index a39d38b2e..6de993c2a 100644 --- a/less/grid.less +++ b/less/grid.less @@ -31,7 +31,7 @@ .generate-grid-columns(@grid-columns); // Then generate the larger grid classes via media query -@media screen and (min-width: 768px) { +@media screen and (min-width: @screen-small) { .generate-large-grid-columns(@grid-columns); } diff --git a/less/progress-bars.less b/less/progress-bars.less index 9df0251e3..e5e6b65a5 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -63,6 +63,7 @@ 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 |