diff options
| author | Mark Otto <[email protected]> | 2013-01-15 10:27:30 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-01-15 10:27:30 -0800 |
| commit | a67c86e40f0b79e8abf5c6c266166db80d8edb72 (patch) | |
| tree | 1f24398e85a74489ed77ee7c5520a0a3d8951ca9 | |
| parent | c34ef691001626728cf5263421899227aa4d3b5b (diff) | |
| download | bootstrap-a67c86e40f0b79e8abf5c6c266166db80d8edb72.tar.xz bootstrap-a67c86e40f0b79e8abf5c6c266166db80d8edb72.zip | |
Fixes #6586: remove top 5px margin from navbar input group button groups
| -rw-r--r-- | docs/assets/css/bootstrap.css | 16 | ||||
| -rw-r--r-- | less/navbar.less | 4 |
2 files changed, 18 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 57325606f..71c42f319 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -714,6 +714,18 @@ a.text-success:hover { color: #356635; } +.text-left { + text-align: left; +} + +.text-right { + text-align: right; +} + +.text-center { + text-align: center; +} + h1, h2, h3, @@ -4387,7 +4399,9 @@ input[type="submit"].btn.btn-mini { .navbar .btn-group .btn, .navbar .input-prepend .btn, -.navbar .input-append .btn { +.navbar .input-append .btn, +.navbar .input-prepend .btn-group, +.navbar .input-append .btn-group { margin-top: 0; } diff --git a/less/navbar.less b/less/navbar.less index 1e488d898..cfbc30a6e 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -95,7 +95,9 @@ } .navbar .btn-group .btn, .navbar .input-prepend .btn, -.navbar .input-append .btn { +.navbar .input-append .btn, +.navbar .input-prepend .btn-group, +.navbar .input-append .btn-group { margin-top: 0; // then undo the margin here so we don't accidentally double it } |