vertical align inline checkboxes/radios to improve rendering in topbar

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 43ec1e417b94e3940194904e09af52a1bedfa276..7b47aebef32d0fd24dbc04efaa2fae9fee151ce3 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -591,6 +591,7 @@ input[type="hidden"] {
 .radio.inline, .checkbox.inline {
   display: inline-block;
   margin-bottom: 0;
+  vertical-align: middle;
 }
 .radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
   margin-left: 10px;
@@ -1953,6 +1954,12 @@ table .span12 {
   margin-top: 5px;
   margin-bottom: 0;
 }
+.navbar-form .radio, .navbar-form .checkbox {
+  margin-top: 5px;
+}
+.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] {
+  margin-top: 3px;
+}
 .navbar-search {
   position: relative;
   float: left;

diff --git a/less/forms.less b/less/forms.less
index 3792bf42052c857067aa75e06e09e415b45273a8..b0daeb034eecb3ef9ee9e9cc665799b7131e0931 100644 (file)
--- a/less/forms.less
+++ b/less/forms.less
@@ -86,7 +86,7 @@ input[type="radio"] {
   line-height: normal;
   border: 0;
   cursor: pointer;
-  border-radius: 0 e("\0/");
+  border-radius: 0 e("\0/"); // Nuke border-radius for IE9 only
 }
 
 // Reset the file input to browser defaults
@@ -169,6 +169,7 @@ input[type="hidden"] {
 .checkbox.inline {
   display: inline-block;
   margin-bottom: 0;
+  vertical-align: middle;
 }
 .radio.inline + .radio.inline,
 .checkbox.inline + .checkbox.inline {

diff --git a/less/navbar.less b/less/navbar.less
index 287459a27c247c129c9de1f982d29dce619b48b9..63484fc3c0977c762c31059c4802de53cb657189 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -63,6 +63,15 @@
     margin-top: 5px;
     margin-bottom: 0;
   }
+  .radio,
+  .checkbox {
+    margin-top: 5px;
+  }
+  input[type="image"],
+  input[type="checkbox"],
+  input[type="radio"] {
+    margin-top: 3px;
+  }
 }
 
 // Navbar search