diff options
| author | Mark Otto <[email protected]> | 2012-07-09 21:01:29 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-07-09 21:01:29 -0700 |
| commit | f495a8d0cc48d1440198e784a8f336a82e3a48bd (patch) | |
| tree | b0f6d178fc7c88c5c566785d245c109fab45bc5b | |
| parent | 413c05a09d42d59df75267a14bd6019b0f6bf1cc (diff) | |
| download | bootstrap-f495a8d0cc48d1440198e784a8f336a82e3a48bd.tar.xz bootstrap-f495a8d0cc48d1440198e784a8f336a82e3a48bd.zip | |
fixes #3210: add .btn to .navbar-form to remove bottom margin, improve vertical align of contents of .navbar-form
| -rw-r--r-- | docs/assets/css/bootstrap.css | 7 | ||||
| -rw-r--r-- | less/navbar.less | 7 | ||||
| -rw-r--r-- | less/scaffolding.less | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 360461afe..61da2f457 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3851,7 +3851,7 @@ input[type="submit"].btn.btn-mini { .navbar .btn, .navbar .btn-group { - margin-top: 5px; + margin-top: 6px; } .navbar .btn-group .btn { @@ -3878,11 +3878,12 @@ input[type="submit"].btn.btn-mini { .navbar-form select, .navbar-form .radio, .navbar-form .checkbox { - margin-top: 5px; + margin-top: 6px; } .navbar-form input, -.navbar-form select { +.navbar-form select, +.navbar-form .btn { display: inline-block; margin-bottom: 0; } diff --git a/less/navbar.less b/less/navbar.less index 660838eb8..c58fd83d0 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -72,7 +72,7 @@ // Buttons in navbar .btn, .btn-group { - .navbarVerticalAlign(30px); // Vertically center in navbar + .navbarVerticalAlign(28px); // Vertically center in navbar } .btn-group .btn { margin: 0; // then undo the margin here so we don't accidentally double it @@ -87,10 +87,11 @@ select, .radio, .checkbox { - .navbarVerticalAlign(30px); // Vertically center in navbar + .navbarVerticalAlign(28px); // Vertically center in navbar } input, - select { + select, + .btn { display: inline-block; margin-bottom: 0; } diff --git a/less/scaffolding.less b/less/scaffolding.less index 5bc90cc16..a218c5478 100644 --- a/less/scaffolding.less +++ b/less/scaffolding.less @@ -4,7 +4,7 @@ // Body reset -// ---------- +// ------------------------- body { margin: 0; @@ -17,7 +17,7 @@ body { // Links -// ----- +// ------------------------- a { color: @linkColor; |