From 7843a665fdc18c1199766d6c65f192209ec35741 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 28 Jan 2012 14:50:56 -0800
Subject: vertical align inline checkboxes/radios to improve rendering in
 topbar

---
 less/forms.less  | 3 ++-
 less/navbar.less | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'less')

diff --git a/less/forms.less b/less/forms.less
index 3792bf420..b0daeb034 100644
--- 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 287459a27..63484fc3c 100644
--- 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
-- 
cgit v1.2.3


From 23e076c1bb73c4950d473cb36218937b2607bc13 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 28 Jan 2012 15:09:23 -0800
Subject: add in a navbar button for toggling the nav items

---
 less/bootstrap.less  | 10 +++++-----
 less/navbar.less     | 23 +++++++++++++++++++++++
 less/responsive.less |  5 +++++
 3 files changed, 33 insertions(+), 5 deletions(-)

(limited to 'less')

diff --git a/less/bootstrap.less b/less/bootstrap.less
index 3dad408c9..ea84f4899 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -33,6 +33,11 @@
 @import "component-animations.less";
 @import "close.less";
 
+// Components: Buttons & Alerts
+@import "buttons.less";
+@import "button-groups.less";
+@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
+
 // Components: Nav
 @import "navs.less";
 @import "navbar.less";
@@ -45,11 +50,6 @@
 @import "tooltip.less";
 @import "popovers.less";
 
-// Components: Buttons & Alerts
-@import "buttons.less";
-@import "button-groups.less";
-@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
-
 // Components: Misc
 @import "thumbnails.less";
 @import "labels.less";
diff --git a/less/navbar.less b/less/navbar.less
index 63484fc3c..a72c0d74e 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -16,6 +16,29 @@
   .box-shadow(@shadow);
 }
 
+// Navbar button for toggling navbar items in responsive layouts
+.btn-navbar {
+  display: none;
+  float: right;
+  padding: 7px 10px;
+  margin-left: 10px;
+  margin-right: 10px;
+  .buttonBackground(@navbarBackgroundHighlight, @navbarBackground);
+  @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+  .box-shadow(@shadow);
+}
+.btn-navbar .i-bar {
+  display: block;
+  width: 18px;
+  height: 2px;
+  background-color: #f5f5f5;
+  .border-radius(1px);
+  .box-shadow(0 1px 0 rgba(0,0,0,.25));
+}
+.btn-navbar .i-bar + .i-bar {
+  margin-top: 3px;
+}
+
 // Brand, links, text, and buttons
 .navbar {
   // Hover and active states
diff --git a/less/responsive.less b/less/responsive.less
index ef2df5f1d..cc3b2882f 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -127,6 +127,11 @@
     margin: 0;
   }
 
+  // Navbar button
+  .btn-navbar {
+    display: block;
+  }
+
 }
 
 
-- 
cgit v1.2.3