diff options
| author | Mark Otto <[email protected]> | 2012-08-27 10:52:11 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-08-27 10:52:11 -0700 |
| commit | a2b9a5e1fecbcad93c0f1b08bf7f470c2aaaabdd (patch) | |
| tree | 8ff3275da0c8902592c99c6ed243644fd7f903b5 | |
| parent | fcd08fce8faaa9fb1a72516a59d8426a496eac7a (diff) | |
| download | bootstrap-a2b9a5e1fecbcad93c0f1b08bf7f470c2aaaabdd.tar.xz bootstrap-a2b9a5e1fecbcad93c0f1b08bf7f470c2aaaabdd.zip | |
fixes #4680: proper margin on buttons in navbar forms
| -rw-r--r-- | docs/assets/css/bootstrap.css | 4 | ||||
| -rw-r--r-- | less/navbar.less | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 09d85da0e..d19d6a442 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4178,7 +4178,9 @@ input[type="submit"].btn.btn-mini { margin-top: 5px; } -.navbar .btn-group .btn { +.navbar .btn-group .btn, +.navbar .input-prepend .btn, +.navbar .input-append .btn { margin-top: 0; } diff --git a/less/navbar.less b/less/navbar.less index a1fe00f51..64e2eb7ea 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -92,7 +92,9 @@ .navbar .btn-group { .navbarVerticalAlign(30px); // Vertically center in navbar } -.navbar .btn-group .btn { +.navbar .btn-group .btn, +.navbar .input-prepend .btn, +.navbar .input-append .btn { margin-top: 0; // then undo the margin here so we don't accidentally double it } |