Merge branch '3.0.0-wip' into bs3_homepage

Conflicts:
	dist/css/bootstrap.min.css
	getting-started.html

10 files changed, 44 insertions, 46 deletions

diff --git a/less/buttons.less b/less/buttons.less
index 9cd6f7354..5d60d39a7 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -131,7 +131,7 @@
   .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
 }
 .btn-xs {
-  padding: 3px 5px;
+  padding: 1px 5px;
 }
 
 
diff --git a/less/dropdowns.less b/less/dropdowns.less
index d9417358b..53aab0267 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -13,6 +13,9 @@
   border-top:   @caret-width-base solid @dropdown-caret-color;
   border-right: @caret-width-base solid transparent;
   border-left:  @caret-width-base solid transparent;
+  // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
+  // we can just straight up remove this.
+  border-bottom: 0 dotted;
   content: "";
 }
 
@@ -161,7 +164,9 @@
 .navbar-fixed-bottom .dropdown {
   // Reverse the caret
   .caret {
-    border-top: 0;
+    // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this
+    // gets fixed, restore `border-top: 0;`.
+    border-top: 0 dotted;
     border-bottom: 4px solid @dropdown-caret-color;
     content: "";
   }
diff --git a/less/mixins.less b/less/mixins.less
index f726b9402..de21668b7 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -524,26 +524,16 @@
 .container-fixed() {
   margin-right: auto;
   margin-left: auto;
+  padding-left:  (@grid-gutter-width / 2);
+  padding-right: (@grid-gutter-width / 2);
   .clearfix();
 }
 
 // Creates a wrapper for a series of columns
 .make-row(@gutter: @grid-gutter-width) {
-  // Then clear the floated columns
+  margin-left:  (@gutter / -2);
+  margin-right: (@gutter / -2);
   .clearfix();
-
-  .container & {
-    @media (min-width: @screen-small) {
-      margin-left:  (@gutter / -2);
-      margin-right: (@gutter / -2);
-    }
-  }
-
-  // Negative margin nested rows out to align the content of columns
-  .row {
-    margin-left:  (@gutter / -2);
-    margin-right: (@gutter / -2);
-  }
 }
 
 // Generate the extra small columns
diff --git a/less/navbar.less b/less/navbar.less
index 339007e07..2141c5255 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -51,20 +51,19 @@
 // content for the user's viewport.
 
 .navbar-collapse {
+  max-height: 340px;
+  overflow-x: visible;
   padding-right: @navbar-padding-horizontal;
   padding-left:  @navbar-padding-horizontal;
   border-top: 1px solid darken(@navbar-bg, 7%);
   box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
-  // Clear floated elements and prevent collapsing of padding
   .clearfix();
-
-  // This is not automatically added to the `.navbar-fixed-top` because it causes
-  // z-index bugs in iOS7 (possibly earlier).
-  max-height: 340px;
-  overflow-x: visible;
-  overflow-y: auto;
   -webkit-overflow-scrolling: touch;
 
+  &.in {
+    overflow-y: auto;
+  }
+
   @media (min-width: @grid-float-breakpoint) {
     width: auto;
     padding-right: 0;
@@ -94,8 +93,8 @@
 
 // Static top (unfixed, but 100% wide) navbar
 .navbar-static-top {
+  border-width: 0 0 1px;
   @media (min-width: @grid-float-breakpoint) {
-    border-width: 0 0 1px;
     border-radius: 0;
   }
 }
@@ -191,10 +190,7 @@
 // the nav the full height of the horizontal nav (above 768px).
 
 .navbar-nav {
-  padding-top:    (@navbar-padding-vertical / 2);
-  padding-bottom: (@navbar-padding-vertical / 2);
-  margin-left: -@navbar-padding-horizontal;
-  margin-right: -@navbar-padding-horizontal;
+  margin: (@navbar-padding-vertical / 2) -@navbar-padding-horizontal;
 
   > li > a {
     padding-top:    10px;
@@ -271,8 +267,6 @@
   @media (min-width: @grid-float-breakpoint) {
     float: left;
     margin: 0;
-    padding-top: 0;
-    padding-bottom: 0;
 
     > li {
       float: left;
diff --git a/less/navs.less b/less/navs.less
index e4b3243d3..abee86dcc 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -42,17 +42,12 @@
   }
 
   // Open dropdowns
-  &.open > a {
+  .open > a {
     &,
     &:hover,
     &:focus {
-      color: @nav-open-link-hover-color;
-      background-color: @link-color;
+      background-color: @nav-link-hover-bg;
       border-color: @link-color;
-      .caret {
-        border-top-color: @nav-open-caret-border-color;
-        border-bottom-color: @nav-open-caret-border-color;
-      }
     }
   }
 
@@ -159,14 +154,20 @@
 
 .nav-justified {
   width: 100%;
+
   > li {
     float: none;
-    display: table-cell;
-    width: 1%;
-    > a {
+     > a {
       text-align: center;
     }
   }
+
+  @media (min-width: @screen-small) {
+    > li {
+      display: table-cell;
+      width: 1%;
+    }
+  }
 }
 
 // Move borders to anchors instead of bottom of list
diff --git a/less/pager.less b/less/pager.less
index 04585a3a7..16993ddc8 100644
--- a/less/pager.less
+++ b/less/pager.less
@@ -23,7 +23,7 @@
     > a:hover,
     > a:focus {
       text-decoration: none;
-      background-color: @pagination-active-bg;
+      background-color: @pagination-hover-bg;
     }
   }
 
diff --git a/less/panels.less b/less/panels.less
index 6d22dd965..5cd04b3db 100644
--- a/less/panels.less
+++ b/less/panels.less
@@ -59,7 +59,7 @@
 .panel-title {
   margin-top: 0;
   margin-bottom: 0;
-  font-size: (@font-size-base * 1.25);
+  font-size: ceil((@font-size-base * 1.125));
   > a {
     color: inherit;
   }
diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less
index cec869083..529152032 100644
--- a/less/responsive-utilities.less
+++ b/less/responsive-utilities.less
@@ -137,7 +137,6 @@
 .visible-print {
   .responsive-invisibility();
 }
-.hidden-print  { }
 
 @media print {
   .visible-print {
diff --git a/less/tables.less b/less/tables.less
index 05c091923..6fa535d15 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -35,6 +35,7 @@ th {
   // Bottom align for column headings
   thead > tr > th {
     vertical-align: bottom;
+    border-bottom: 2px solid @table-border-color;
   }
   // Remove top border from thead by default
   caption + thead,
@@ -92,6 +93,14 @@ th {
       }
     }
   }
+  > thead {
+    > tr {
+      > th,
+      > td {
+        border-bottom-width: 2px;
+      }
+    }
+  }
 }
 
 
diff --git a/less/variables.less b/less/variables.less
index aa0f9fb0c..c3eeaaebc 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -600,10 +600,10 @@
 // --------------------------------------------------
 
 // Small screen / tablet
-@container-tablet:          720px;
+@container-tablet:          ((720px + @grid-gutter-width));
 
 // Medium screen / desktop
-@container-desktop:         940px;
+@container-desktop:         ((940px + @grid-gutter-width));
 
 // Large screen / wide desktop
-@container-large-desktop:   1140px;
+@container-large-desktop:   ((1140px + @grid-gutter-width));