aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-12 20:28:22 -0800
committerMark Otto <[email protected]>2012-02-12 20:28:22 -0800
commit3e00c1261fa3d48b184874c9f5b94ce370bd6449 (patch)
treeaa164b7360c6ba6a20ddc3e4e3283d9e66f95812 /less
parentbe6fdd9a62a41bf4316dbe4c139787a568ac5bb7 (diff)
downloadbootstrap-3e00c1261fa3d48b184874c9f5b94ce370bd6449.tar.xz
bootstrap-3e00c1261fa3d48b184874c9f5b94ce370bd6449.zip
allow .input-prepend/.input-append to work in .navbar per #1681
Diffstat (limited to 'less')
-rw-r--r--less/navbar.less10
1 files changed, 9 insertions, 1 deletions
diff --git a/less/navbar.less b/less/navbar.less
index 35c209fc4..16553c1ff 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -81,7 +81,7 @@
margin-top: 5px; // make buttons vertically centered in navbar
}
.btn-group .btn {
- margin-top: 0;
+ margin-top: 0; // then undo the margin here so we don't accidentally double it
}
}
@@ -104,6 +104,14 @@
input[type="radio"] {
margin-top: 3px;
}
+ .input-append,
+ .input-prepend {
+ margin-top: 6px;
+ white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left
+ input {
+ margin-top: 0; // remove the margin on top since it's on the parent
+ }
+ }
}
// Navbar search