Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/components.html
	docs/css.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/extend.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/buttons.less
	less/forms.less
	less/navbar.less
	less/popovers.less
	less/responsive-767px-max.less
	less/responsive.less
	less/tables.less
	less/tooltip.less
	less/type.less
	less/variables.less
	package.json

8 files changed, 41 insertions, 22 deletions

diff --git a/less/buttons.less b/less/buttons.less
index f7b99b1e7..4295d2dcf 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -125,7 +125,6 @@ input[type="button"] {
         border-color: darken(@btn-border, 10%);
   }
 }
-// Primary appears as blue
 .btn-primary {
   background-color: @btn-background-primary;
       border-color: @btn-border-primary;
diff --git a/less/mixins.less b/less/mixins.less
index 1ab0a4eb2..eeab4bbb0 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -182,6 +182,12 @@
        -o-transition-delay: @transition-delay;
           transition-delay: @transition-delay;
 }
+.transition-duration(@transition-duration) {
+  -webkit-transition-duration: @transition-duration;
+     -moz-transition-duration: @transition-duration;
+       -o-transition-duration: @transition-duration;
+          transition-duration: @transition-duration;
+}
 
 // Transformations
 .rotate(@degrees) {
diff --git a/less/navbar.less b/less/navbar.less
index 2894c92bc..70f501acc 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -299,8 +299,8 @@
 
 // Caret should match text color on hover
 .navbar .nav li.dropdown > a:hover .caret {
-  border-top-color: @navbar-link-color-active;
-  border-bottom-color: @navbar-link-color-active;
+  border-top-color: @navbar-link-color-hover;
+  border-bottom-color: @navbar-link-color-hover;
 }
 
 // Remove background color from open dropdown
diff --git a/less/popovers.less b/less/popovers.less
index 89c172184..feca92ad3 100644
--- a/less/popovers.less
+++ b/less/popovers.less
@@ -9,7 +9,7 @@
   left: 0;
   z-index: @zindex-popover;
   display: none;
-  width: 236px;
+  max-width: 276px;
   padding: 1px;
   text-align: left; // Reset given new insertion method
   background-color: @popover-background;
@@ -40,6 +40,10 @@
   background-color: @popover-title-background;
   border-bottom: 1px solid darken(@popover-title-background, 5%);
   border-radius: 5px 5px 0 0;
+
+  &:empty {
+    display: none;
+  }
 }
 
 .popover-content {
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less
index e690f239d..cf4b49249 100644
--- a/less/responsive-767px-max.less
+++ b/less/responsive-767px-max.less
@@ -49,7 +49,6 @@
     margin-left: 0;
   }
 
-
   // FORM FIELDS
   // -----------
   // Make span* classes full width
diff --git a/less/tables.less b/less/tables.less
index 3fe3d6d96..a524b380f 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -92,24 +92,32 @@ table {
   tbody:first-child tr:first-child td {
     border-top: 0;
   }
-  // For first th or td in the first row in the first thead or tbody
+  // For first th/td in the first row in the first thead or tbody
   thead:first-child tr:first-child > th:first-child,
-  tbody:first-child tr:first-child > td:first-child {
+  tbody:first-child tr:first-child > td:first-child,
+  tbody:first-child tr:first-child > th:first-child {
     border-top-left-radius: @border-radius-base;
   }
+  // For last th/td in the first row in the first thead or tbody
   thead:first-child tr:first-child > th:last-child,
-  tbody:first-child tr:first-child > td:last-child {
+  tbody:first-child tr:first-child > td:last-child,
+  tbody:first-child tr:first-child > th:last-child {
     border-top-right-radius: @border-radius-base;
   }
-  // For first th or td in the last row in the last thead or tbody
+  // For first th/td (can be either) in the last row in the last thead, tbody, and tfoot
   thead:last-child tr:last-child > th:first-child,
   tbody:last-child tr:last-child > td:first-child,
-  tfoot:last-child tr:last-child > td:first-child {
+  tbody:last-child tr:last-child > th:first-child,
+  tfoot:last-child tr:last-child > td:first-child,
+  tfoot:last-child tr:last-child > th:first-child {
     border-bottom-left-radius: @border-radius-base;
   }
+  // For last th/td (can be either) in the last row in the last thead, tbody, and tfoot
   thead:last-child tr:last-child > th:last-child,
   tbody:last-child tr:last-child > td:last-child,
-  tfoot:last-child tr:last-child > td:last-child {
+  tbody:last-child tr:last-child > th:last-child,
+  tfoot:last-child tr:last-child > td:last-child,
+  tfoot:last-child tr:last-child > th:last-child {
     border-bottom-right-radius: @border-radius-base;
   }
 
@@ -159,8 +167,8 @@ table {
 // Placed here since it has to come after the potential zebra striping
 .table-hover {
   tbody {
-    tr:hover td,
-    tr:hover th {
+    tr:hover > td,
+    tr:hover > th {
       background-color: @table-background-hover;
     }
   }
@@ -184,32 +192,32 @@ table th[class*="span"] {
 // Exact selectors below required to override .table-striped
 
 .table tbody tr {
-  &.success td {
+  &.success > td {
     background-color: @state-success-background;
   }
-  &.error td {
+  &.error > td {
     background-color: @state-error-background;
   }
-  &.warning td {
+  &.warning > td {
     background-color: @state-warning-background;
   }
-  &.info td {
+  &.info > td {
     background-color: @state-info-background;
   }
 }
 
 // Hover states for .table-hover
 .table-hover tbody tr {
-  &.success:hover td {
+  &.success:hover > td {
     background-color: darken(@state-success-background, 5%);
   }
-  &.error:hover td {
+  &.error:hover > td {
     background-color: darken(@state-error-background, 5%);
   }
-  &.warning:hover td {
+  &.warning:hover > td {
     background-color: darken(@state-warning-background, 5%);
   }
-  &.info:hover td {
+  &.info:hover > td {
     background-color: darken(@state-info-background, 5%);
   }
 }
diff --git a/less/tooltip.less b/less/tooltip.less
index cc4dbe61d..65f5c7a82 100644
--- a/less/tooltip.less
+++ b/less/tooltip.less
@@ -11,6 +11,7 @@
   visibility: visible;
   padding: 5px;
   font-size: 11px;
+  line-height: 1.4;
   .opacity(0);
   &.in     { .opacity(100); }
   &.top    { margin-top:  -3px; }
diff --git a/less/type.less b/less/type.less
index a1789fd79..89e65fff8 100644
--- a/less/type.less
+++ b/less/type.less
@@ -181,7 +181,9 @@ blockquote {
   border-left: 5px solid @grayLighter;
   p {
     margin-bottom: 0;
-    #font > .shorthand(16px,300,@line-height-base * 1.25);
+    font-size: @font-size-base * 1.25;
+    font-weight: 300;
+    line-height: 1.25;
   }
   small {
     display: block;