aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-08-14 16:24:58 -0700
committerMark Otto <[email protected]>2012-08-14 16:24:58 -0700
commit9c72246d491fa942635a27ee0047e473f4df05cc (patch)
tree70dec891d7d88cf1ea91f05a97fed459f3f482ca /less
parentf3479a39537b7b10bf66846c11d500f3364af88a (diff)
downloadbootstrap-9c72246d491fa942635a27ee0047e473f4df05cc.tar.xz
bootstrap-9c72246d491fa942635a27ee0047e473f4df05cc.zip
navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from #3946
Diffstat (limited to 'less')
-rw-r--r--less/component-animations.less1
-rw-r--r--less/mixins.less3
-rw-r--r--less/navbar.less4
3 files changed, 5 insertions, 3 deletions
diff --git a/less/component-animations.less b/less/component-animations.less
index d614263a7..2166776d9 100644
--- a/less/component-animations.less
+++ b/less/component-animations.less
@@ -15,6 +15,7 @@
position: relative;
height: 0;
overflow: hidden;
+ overflow: visible \9;
.transition(height .35s ease);
&.in {
height: auto;
diff --git a/less/mixins.less b/less/mixins.less
index b1b8ae80a..20dd0d19a 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -154,11 +154,12 @@
.input-block-level {
display: block;
width: 100%;
- min-height: 28px; // Make inputs at least the height of their button counterpart
+ min-height: 30px; // Make inputs at least the height of their button counterpart
.box-sizing(border-box); // Makes inputs behave like true block-level elements
}
+
// Mixin for form field states
.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
// Set the text color
diff --git a/less/navbar.less b/less/navbar.less
index 4439dcde3..bf94ed688 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -327,8 +327,8 @@
}
// Right aligned menus need alt position
-.navbar .pull-right .dropdown-menu,
-.navbar .dropdown-menu.pull-right {
+.navbar .pull-right > li > .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right {
left: auto;
right: 0;
&:before {