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

docs/assets/css/docs.css

@@ -163,7 +163,7 @@ body > .navbar-fixed .brand:hover {
 /* Marketing section of Overview
 -------------------------------------------------- */
 .marketing .row {
-  margin-bottom: 18px;
+  margin-bottom: 9px;
 }
 .marketing h1 {
   margin: 36px 0 27px;

docs/components.html

@@ -506,7 +506,7 @@
 <pre class="prettyprint linenums">
 &lt;div class="navbar navbar-static"&gt;
   &lt;div class="navbar-inner"&gt;
-    &lt;div class="container" style="width: auto;"&gt;
+    &lt;div class="container"&gt;
       ...
     &lt;/div&gt;
   &lt;/div&gt;

docs/index.html

@@ -127,6 +127,7 @@
           </ul>
 
           <h1>Designed for everyone, everywhere.</h1>
+          <p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
           <div class="row">
             <div class="span4">
               <img class="icon" src="assets/img/glyphicons/glyphicons_042_group.png">
@@ -153,7 +154,7 @@
             <div class="span4">
               <img class="icon" src="assets/img/glyphicons/glyphicons_214_resize_small.png">
               <h2>Responsive design</h2>
-              <p>With Bootstrap 2, we've gone fully responsive. Our components are flexible enough to scale according to whatever resolution or device you're using to provide a consistent experience, no matter what.</p>
+              <p>With Bootstrap 2, we've gone fully responsive. Our components are scale according to a range of resolutions and devices to provide a consistent experience, no matter what.</p>
             </div>
             <div class="span4">
               <img class="icon" src="assets/img/glyphicons/glyphicons_266_book_open.png">
@@ -205,7 +206,7 @@
           <!-- Quickstart options
           ================================================== -->
           <h1>Get started in no time.</h1>
-          <p class="marketing-byline">Built for any skill level, Bootstrap fits your workflow and development process.</p>
+          <p class="marketing-byline">Quickly start using Bootstrap within your workflow and development process.</p>
           <table class="bordered-table getting-started">
             <tbody>
               <tr>

lib/navs.less

@@ -175,21 +175,25 @@
 // ---------
 
 // Position the menu
-.nav .dropdown-menu {
+.pills .dropdown-menu,
+.tabs .dropdown-menu {
   top: 33px;
   border-width: 1px;
 }
 .pills .dropdown-menu {
   .border-radius(4px);
 }
-.nav .dropdown-toggle .caret {
+.tabs .dropdown-toggle .caret,
+.pills .dropdown-toggle .caret {
   border-top-color: @linkColor;
   margin-top: 6px;
 }
-.nav .dropdown-toggle:hover .caret {
+.tabs .dropdown-toggle:hover .caret,
+.pills .dropdown-toggle:hover .caret {
   border-top-color: @linkColorHover;
 }
-.nav .open .dropdown-toggle {
+.tabs .open .dropdown-toggle,
+.pills .open .dropdown-toggle {
   background-color: #999;
   border-color: #999;
 }

lib/responsive.less

@@ -67,7 +67,6 @@
       .opacity(100);
       content: "↓";
     }
-
     .nav:hover > li {
       display: block;
     }
@@ -76,13 +75,6 @@
     }
   }
 
-  // Resize modals
-  .modal {
-    width: auto;
-    margin: 0;
-    &.fade.in { top: auto; }
-  }
-
   // Remove the horizontal form styles
   .horizontal-form .control-group > label {
     float: none;
@@ -110,10 +102,12 @@
     left: 20px;
     right: 20px;
     width: auto;
-    .close {
-      padding: 10px;
+    &.fade.in { top: auto; }
   }
+  .modal-header .close {
+    padding: 10px;
   }
+
 }
 
 

lib/scaffolding.less

@@ -39,8 +39,14 @@ body {
 .sidebar-right  { padding-right: @fluidSidebarWidth + 40; }
 
 // Float the sidebars accordingly
-.sidebar-left .fluid-sidebar   { float: left; margin-left: (@fluidSidebarWidth + 20) * -1; }
-.sidebar-right .fluid-sidebar  { float: right; margin-right: (@fluidSidebarWidth + 20) * -1; }
+.sidebar-left .fluid-sidebar {
+  float: left;
+  margin-left: (@fluidSidebarWidth + 20) * -1;
+}
+.sidebar-right .fluid-sidebar {
+  float: right;
+  margin-right: (@fluidSidebarWidth + 20) * -1;
+}
 
 // The main content area
 .fluid-content {

lib/variables.less

@@ -49,12 +49,13 @@
 
 // Z-INDEX
 // -------
+
 @zindexDropdown:        1000;
-@zindexFixedNavbar:     1010;
-@zindexModalBackdrop:   1020;
-@zindexModal:           1030;
-@zindexPopover:         1040;
-@zindexTwipsy:          1050;
+@zindexPopover:         1010;
+@zindexTwipsy:          1020;
+@zindexFixedNavbar:     1030;
+@zindexModalBackdrop:   1040;
+@zindexModal:           1050;
 
 
 // THEME VARIABLES