diff options
| author | Mark Otto <[email protected]> | 2014-03-03 21:50:03 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-03 21:50:03 -0800 |
| commit | 2ece8dd33616bc2e7f753d108810df7eeac7c3a9 (patch) | |
| tree | 88376b4fca645a8c2fa6267d301d92c0bf639919 /less | |
| parent | b22f064c2ee38dbd84635d91b8a809a8923f5bfd (diff) | |
| parent | e381635b1faf7480bcf54618804a62dd4a049a93 (diff) | |
| download | bootstrap-2ece8dd33616bc2e7f753d108810df7eeac7c3a9.tar.xz bootstrap-2ece8dd33616bc2e7f753d108810df7eeac7c3a9.zip | |
Merge branch 'master' into rtl_via_css_flip
Diffstat (limited to 'less')
| -rw-r--r-- | less/component-animations.less | 10 | ||||
| -rw-r--r-- | less/mixins.less | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/less/component-animations.less b/less/component-animations.less index 1efe45e2c..9400a0d32 100644 --- a/less/component-animations.less +++ b/less/component-animations.less @@ -5,7 +5,7 @@ // Heads up! // // We don't use the `.opacity()` mixin here since it causes a bug with text -// fields in IE7-8. Source: https://github.com/twitter/bootstrap/pull/3552. +// fields in IE7-8. Source: https://github.com/twbs/bootstrap/pull/3552. .fade { opacity: 0; @@ -17,10 +17,12 @@ .collapse { display: none; - &.in { - display: block; - } + + &.in { display: block; } + tr&.in { display: table-row; } + tbody&.in { display: table-row-group; } } + .collapsing { position: relative; height: 0; diff --git a/less/mixins.less b/less/mixins.less index 4432cfc2d..727cf55a1 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -243,6 +243,10 @@ -webkit-animation-direction: @direction; animation-direction: @direction; } +.animation-fill-mode(@fill-mode) { + -webkit-animation-fill-mode: @fill-mode; + animation-fill-mode: @fill-mode; +} // Backface visibility // Prevent browsers from flickering when using CSS 3D transforms. @@ -372,7 +376,8 @@ // Retina images // -// Short retina mixin for setting background-image and -size +// Short retina mixin for setting background-image and -size. Note that the +// spelling of `min--moz-device-pixel-ratio` is intentional. .img-retina(@file-1x; @file-2x; @width-1x; @height-1x) { background-image: url("@{file-1x}"); |