From 6cfd176ac3d0eedc5b9b50fd88bf0774af0f1222 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 23 Sep 2014 13:29:19 -0700 Subject: [PATCH] Reverts 0ec05da0eea03849fc72bed84a2c7fe7be1de1b6 to bring back #14444 to fix #14348 (again) --- less/component-animations.less | 7 +++++-- less/navbar.less | 1 + less/navs.less | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/less/component-animations.less b/less/component-animations.less index 9400a0d32f..967715d98b 100644 --- a/less/component-animations.less +++ b/less/component-animations.less @@ -17,8 +17,9 @@ .collapse { display: none; + visibility: hidden; - &.in { display: block; } + &.in { display: block; visibility: visible; } tr&.in { display: table-row; } tbody&.in { display: table-row-group; } } @@ -27,5 +28,7 @@ position: relative; height: 0; overflow: hidden; - .transition(height .35s ease); + .transition-property(~"height, visibility"); + .transition-duration(.35s); + .transition-timing-function(ease); } diff --git a/less/navbar.less b/less/navbar.less index bb2f10a589..30a79d4a43 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -67,6 +67,7 @@ &.collapse { display: block !important; + visibility: visible !important; height: auto !important; padding-bottom: 0; // Override default setting overflow: visible !important; diff --git a/less/navs.less b/less/navs.less index 98a64307ac..8cf81d7e17 100644 --- a/less/navs.less +++ b/less/navs.less @@ -223,9 +223,11 @@ .tab-content { > .tab-pane { display: none; + visibility: hidden; } > .active { display: block; + visibility: visible; } }