Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

docs/assets/css/bootstrap-responsive.css

@@ -86,6 +86,9 @@
     width: auto;
     margin: 0;
   }
+  .btn-navbar {
+    display: block;
+  }
 }
 @media (min-width: 768px) and (max-width: 940px) {
   .container {

docs/base-css.html

@@ -33,6 +33,11 @@
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
+          <a class="btn btn-navbar">
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+          </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li class="">

docs/components.html

@@ -33,6 +33,11 @@
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
+          <a class="btn btn-navbar">
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+          </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li class="">

docs/download.html

@@ -33,6 +33,11 @@
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
+          <a class="btn btn-navbar">
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+          </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li class="">

docs/examples.html

@@ -33,6 +33,11 @@
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
+          <a class="btn btn-navbar">
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+          </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li class="">

docs/index.html

@@ -33,6 +33,11 @@
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
+          <a class="btn btn-navbar">
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+          </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li class="active">

docs/javascript.html

@@ -33,6 +33,11 @@
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
+          <a class="btn btn-navbar">
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+          </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li class="">

docs/less.html

@@ -33,6 +33,11 @@
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
+          <a class="btn btn-navbar">
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+          </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li class="">

docs/scaffolding.html

@@ -33,6 +33,11 @@
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
+          <a class="btn btn-navbar">
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+          </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li class="">

docs/templates/layout.mustache

@@ -33,6 +33,11 @@
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
+          <a class="btn btn-navbar">
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+          </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li class="{{index}}">

docs/upgrading.html

@@ -33,6 +33,11 @@
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
+          <a class="btn btn-navbar">
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+            <span class="i-bar"></span>
+          </a>
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li class="">

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";

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 {

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
@@ -63,6 +86,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

less/responsive.less

@@ -127,6 +127,11 @@
     margin: 0;
   }
 
+  // Navbar button
+  .btn-navbar {
+    display: block;
+  }
+
 }