diff options
| author | Mark Otto <[email protected]> | 2012-04-24 06:39:14 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-04-24 06:39:14 -0700 |
| commit | f9744ff52207617ec4610809603f34d7eba1d077 (patch) | |
| tree | f2bf219700234d17f716786f3832dd8a1e0aa5e7 | |
| parent | e659dc7e1be2e09cec34703dce8c737496e3504e (diff) | |
| download | bootstrap-f9744ff52207617ec4610809603f34d7eba1d077.tar.xz bootstrap-f9744ff52207617ec4610809603f34d7eba1d077.zip | |
make component animations work cross browsers with opacity mixin, restore float on thumbnails > li
| -rw-r--r-- | docs/assets/css/bootstrap.css | 11 | ||||
| -rw-r--r-- | less/component-animations.less | 8 | ||||
| -rw-r--r-- | less/thumbnails.less | 1 |
3 files changed, 12 insertions, 8 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index bca6b7c32..863e5230c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2499,6 +2499,7 @@ table .span24 { .fade { opacity: 0; + filter: alpha(opacity=0); -webkit-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; -ms-transition: opacity 0.15s linear; @@ -2508,6 +2509,7 @@ table .span24 { .fade.in { opacity: 1; + filter: alpha(opacity=100); } .collapse { @@ -4445,6 +4447,7 @@ input[type="submit"].btn.btn-mini { } .thumbnails > li { + float: left; margin-bottom: 18px; } @@ -4647,15 +4650,15 @@ a.badge:hover { -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; -webkit-transition: width 0.6s ease; -moz-transition: width 0.6s ease; -ms-transition: width 0.6s ease; -o-transition: width 0.6s ease; transition: width 0.6s ease; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; } .progress-striped .bar { diff --git a/less/component-animations.less b/less/component-animations.less index 5a1e202d1..da1f2e535 100644 --- a/less/component-animations.less +++ b/less/component-animations.less @@ -2,17 +2,17 @@ // -------------------- .fade { - opacity: 0; + .opacity(0); .transition(opacity .15s linear); &.in { - opacity: 1; + .opacity(100); } } .collapse { - position:relative; + position: relative; height: 0; - overflow:hidden; + overflow: hidden; .transition(height .35s ease); &.in { height: auto; diff --git a/less/thumbnails.less b/less/thumbnails.less index 7fa77afa9..012def577 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -14,6 +14,7 @@ // Float li to make thumbnails appear in a row .thumbnails > li { + float: left; // Explicity set the float since we don't require .span* classes margin-bottom: @baseLineHeight; } |