aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-11 22:43:35 -0700
committerMark Otto <[email protected]>2012-03-11 22:43:35 -0700
commit0090fa1a6ec429958fad8f74974bd03e99bbf55e (patch)
treead5900d9a474b9e9f83a2f0e938034490d2549fb
parentac7f571e536f4a6d5ee28fba50810d84e4dc1403 (diff)
downloadbootstrap-0090fa1a6ec429958fad8f74974bd03e99bbf55e.tar.xz
bootstrap-0090fa1a6ec429958fad8f74974bd03e99bbf55e.zip
fix overflow on .collapse.in to enable dropdowns within an open collapse
-rw-r--r--docs/assets/bootstrap.zipbin55416 -> 55418 bytes
-rw-r--r--docs/assets/css/bootstrap.css1
-rw-r--r--less/component-animations.less5
3 files changed, 5 insertions, 1 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 1b149b002..5a1c83132 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b1490bae8..16fef5042 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1928,6 +1928,7 @@ table .span24 {
}
.collapse.in {
height: auto;
+ overflow: visible;
}
.close {
float: right;
diff --git a/less/component-animations.less b/less/component-animations.less
index 4f2a4fd11..edfaef301 100644
--- a/less/component-animations.less
+++ b/less/component-animations.less
@@ -14,5 +14,8 @@
position:relative;
overflow:hidden;
height: 0;
- &.in { height: auto; }
+ &.in {
+ height: auto;
+ overflow: visible;
+ }
}