aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-09-23 13:29:19 -0700
committerMark Otto <[email protected]>2014-09-23 13:29:19 -0700
commit6cfd176ac3d0eedc5b9b50fd88bf0774af0f1222 (patch)
tree017bef69098b61ec40ac6e0d6c6dd6116f1c0b12
parentccecb7cde4f954a8941100b24c1b0c2008088276 (diff)
downloadbootstrap-6cfd176ac3d0eedc5b9b50fd88bf0774af0f1222.tar.xz
bootstrap-6cfd176ac3d0eedc5b9b50fd88bf0774af0f1222.zip
Reverts 0ec05da0eea03849fc72bed84a2c7fe7be1de1b6 to bring back #14444 to fix #14348 (again)
-rw-r--r--less/component-animations.less7
-rw-r--r--less/navbar.less1
-rw-r--r--less/navs.less2
3 files changed, 8 insertions, 2 deletions
diff --git a/less/component-animations.less b/less/component-animations.less
index 9400a0d32..967715d98 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 bb2f10a58..30a79d4a4 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 98a64307a..8cf81d7e1 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;
}
}