diff options
| author | Mark Otto <[email protected]> | 2013-07-26 20:53:26 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-26 20:53:26 -0700 |
| commit | 27a656f72e8b31bda944f4e083ce8d667d96a0e8 (patch) | |
| tree | d8e3ad1500db2cc8fffb459c948ae599e4047058 /less | |
| parent | 425ec58ea964b632b085c65daf415988ce12a4cb (diff) | |
| parent | 93eeb8578d3d5d2629f27316af71395817b23bdd (diff) | |
| download | bootstrap-27a656f72e8b31bda944f4e083ce8d667d96a0e8.tar.xz bootstrap-27a656f72e8b31bda944f4e083ce8d667d96a0e8.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'less')
| -rw-r--r-- | less/component-animations.less | 10 | ||||
| -rw-r--r-- | less/navbar.less | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/less/component-animations.less b/less/component-animations.less index 8393aa44c..1efe45e2c 100644 --- a/less/component-animations.less +++ b/less/component-animations.less @@ -16,12 +16,14 @@ } .collapse { + display: none; + &.in { + display: block; + } +} +.collapsing { position: relative; height: 0; overflow: hidden; .transition(height .35s ease); - - &.in { - height: auto; - } } diff --git a/less/navbar.less b/less/navbar.less index 4335413ef..653a8d6d9 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -330,6 +330,7 @@ display: none; } .nav-collapse.collapse { + display: block !important; height: auto !important; overflow: visible !important; } |