diff options
| author | Mark Otto <[email protected]> | 2012-02-12 20:28:22 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-12 20:28:22 -0800 |
| commit | 3e00c1261fa3d48b184874c9f5b94ce370bd6449 (patch) | |
| tree | aa164b7360c6ba6a20ddc3e4e3283d9e66f95812 /docs | |
| parent | be6fdd9a62a41bf4316dbe4c139787a568ac5bb7 (diff) | |
| download | bootstrap-3e00c1261fa3d48b184874c9f5b94ce370bd6449.tar.xz bootstrap-3e00c1261fa3d48b184874c9f5b94ce370bd6449.zip | |
allow .input-prepend/.input-append to work in .navbar per #1681
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 53056 -> 53129 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 7 |
2 files changed, 7 insertions, 0 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 15db21f3c..62f900de9 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 61e67360c..38b1719de 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2530,6 +2530,13 @@ button.btn.small, input[type="submit"].btn.small { .navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] { margin-top: 3px; } +.navbar-form .input-append, .navbar-form .input-prepend { + margin-top: 6px; + white-space: nowrap; +} +.navbar-form .input-append input, .navbar-form .input-prepend input { + margin-top: 0; +} .navbar-search { position: relative; float: left; |