diff options
| author | Mark Otto <[email protected]> | 2012-08-24 14:45:02 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-08-24 14:45:02 -0700 |
| commit | d9593e217d9ed8bf8f0b5c119b1eca021608ceeb (patch) | |
| tree | 6afe7ab518c297ec257d0b1ec73845369a411a2a | |
| parent | 0682780cd858b327518b8664c3e332659e08c765 (diff) | |
| download | bootstrap-d9593e217d9ed8bf8f0b5c119b1eca021608ceeb.tar.xz bootstrap-d9593e217d9ed8bf8f0b5c119b1eca021608ceeb.zip | |
avoid top margin on input-append/prepend in .navbar-form
| -rw-r--r-- | docs/assets/css/bootstrap.css | 2 | ||||
| -rw-r--r-- | less/navbar.less | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b7aa3fd1c..51c214376 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4197,6 +4197,8 @@ input[type="submit"].btn.btn-mini { white-space: nowrap; } +.navbar-form .input-append .btn, +.navbar-form .input-prepend .btn, .navbar-form .input-append input, .navbar-form .input-prepend input { margin-top: 0; diff --git a/less/navbar.less b/less/navbar.less index 63d95fe9f..65137ea9e 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -90,10 +90,11 @@ .navbarVerticalAlign(28px); // Vertically center in navbar } .navbar .btn-group .btn { - margin: 0; // then undo the margin here so we don't accidentally double it + margin-top: 0; // then undo the margin here so we don't accidentally double it } // Navbar forms +// ------------------------- .navbar-form { margin-bottom: 0; // remove default bottom margin .clearfix(); @@ -125,6 +126,7 @@ } // Navbar search +// ------------------------- .navbar-search { position: relative; float: left; |