Merge branch '2.2.2-wip' into 3.0.0-wip

Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less

11 files changed, 47 insertions, 96 deletions

diff --git a/less/alerts.less b/less/alerts.less
index b8a74a817..34a830ce2 100644
--- a/less/alerts.less
+++ b/less/alerts.less
@@ -40,17 +40,27 @@
   border-color: @state-success-border;
   color: @state-success-text;
 }
+.alert-success h4 {
+  color: @state-success-text;
+}
 .alert-danger,
 .alert-error {
   background-color: @state-error-background;
   border-color: @state-error-border;
   color: @state-error-text;
 }
+.alert-danger h4,
+.alert-error h4 {
+  color: @state-error-text;
+}
 .alert-info {
   background-color: @state-info-background;
   border-color: @state-info-border;
   color: @state-info-text;
 }
+.alert-info h4 {
+  color: @state-info-text;
+}
 
 
 // Block alerts
diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less
index 9d2dd5a5f..dea69138e 100644
--- a/less/breadcrumbs.less
+++ b/less/breadcrumbs.less
@@ -9,7 +9,7 @@
   list-style: none;
   background-color: #f5f5f5;
   border-radius: @border-radius-base;
-  li {
+  > li {
     display: inline-block;
     text-shadow: 0 1px 0 #fff;
     &:after {
@@ -19,7 +19,7 @@
       color: #ccc;
     }
   }
-  .active {
+  > .active {
     color: @grayLight;
   }
 }
diff --git a/less/mixins.less b/less/mixins.less
index ab63757f6..63be2318c 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -133,7 +133,7 @@
 
 
 // Mixin for form field states
-.formFieldState(@text-color: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
+.formFieldState(@text-color: #555, @border-color: #ccc, @background-color: #f5f5f5) {
   // Set the text color
   .control-label,
   .help-block,
@@ -151,11 +151,11 @@
   input,
   select,
   textarea {
-    border-color: @borderColor;
+    border-color: @border-color;
     .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
     &:focus {
-      border-color: darken(@borderColor, 10%);
-      @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
+      border-color: darken(@border-color, 10%);
+      @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%);
       .box-shadow(@shadow);
     }
   }
@@ -163,7 +163,7 @@
   .input-prepend .add-on,
   .input-append .add-on {
     color: @text-color;
-    background-color: @backgroundColor;
+    background-color: @background-color;
     border-color: @text-color;
   }
 }
@@ -297,13 +297,13 @@
 }
 
 // CSS3 Content Columns
-.content-columns(@columnCount, @columnGap: @grid-gutter-width) {
-  -webkit-column-count: @columnCount;
-     -moz-column-count: @columnCount;
-          column-count: @columnCount;
-  -webkit-column-gap: @columnGap;
-     -moz-column-gap: @columnGap;
-          column-gap: @columnGap;
+.content-columns(@column-count, @column-gap: @grid-gutter-width) {
+  -webkit-column-count: @column-count;
+     -moz-column-count: @column-count;
+          column-count: @column-count;
+  -webkit-column-gap: @column-gap;
+     -moz-column-gap: @column-gap;
+          column-gap: @column-gap;
 }
 
 // Optional hyphenation
@@ -345,7 +345,7 @@
     background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
     background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
     background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
-    background-image: linear-gradient(top, @startColor, @endColor); // Standard, IE10
+    background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10
     background-repeat: repeat-x;
     filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down
   }
@@ -433,8 +433,8 @@
 // -------------------------
 // Vertically center elements in the navbar.
 // Example: an element has a height of 30px, so write out `.navbarVerticalAlign(30px);` to calculate the appropriate top margin.
-.navbarVerticalAlign(@elementHeight) {
-  margin-top: (@navbar-height - @elementHeight) / 2;
+.navbarVerticalAlign(@element-height) {
+  margin-top: (@navbar-height - @element-height) / 2;
 }
 
 
diff --git a/less/modals.less b/less/modals.less
index b1f57d7a1..584346e94 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -57,6 +57,7 @@
 
 // Body (where all modal content resides)
 .modal-body {
+  position: relative;
   overflow-y: auto;
   max-height: 400px;
   padding: 15px;
diff --git a/less/popovers.less b/less/popovers.less
index 61b3f1283..89c172184 100644
--- a/less/popovers.less
+++ b/less/popovers.less
@@ -11,6 +11,7 @@
   display: none;
   width: 236px;
   padding: 1px;
+  text-align: left; // Reset given new insertion method
   background-color: @popover-background;
   -webkit-background-clip: padding-box;
      -moz-background-clip: padding;
@@ -43,9 +44,6 @@
 
 .popover-content {
   padding: 9px 14px;
-  p, ul, ol {
-    margin-bottom: 0;
-  }
 }
 
 // Arrows
@@ -128,62 +126,4 @@
     }
   }
 
-
-
-/*
-  &.top .arrow {
-    bottom: -@popover-arrow-width;
-    left: 50%;
-    margin-left: -@popover-arrow-width;
-    border-width: @popover-arrow-width @popover-arrow-width 0;
-    //border-top-color: @popover-arrow-color;
-    border-top-color: blue;
-    &:after {
-      border-width: @popover-arrow-outer-width @popover-arrow-outer-width 0;
-      //border-top-color: @popover-arrow-outer-color;
-      border-top-color: red;
-      top: -@popover-arrow-width;
-      //bottom: -1px;
-      left: -@popover-arrow-outer-width;
-    }
-  }
-  &.right .arrow {
-    top: 50%;
-    left: -@popover-arrow-width;
-    margin-top: -@popover-arrow-width;
-    border-width: @popover-arrow-width @popover-arrow-width @popover-arrow-width 0;
-    border-right-color: @popover-arrow-color;
-    &:after {
-      border-width: @popover-arrow-outer-width @popover-arrow-outer-width @popover-arrow-outer-width 0;
-      border-right-color: @popover-arrow-outer-color;
-      bottom: -@popover-arrow-outer-width;
-      left: -1px;
-    }
-  }
-  &.bottom .arrow {
-    top: -@popover-arrow-width;
-    left: 50%;
-    margin-left: -@popover-arrow-width;
-    border-width: 0 @popover-arrow-width @popover-arrow-width;
-    border-bottom-color: @popover-arrow-color;
-    &:after {
-      border-width: 0 @popover-arrow-outer-width @popover-arrow-outer-width;
-      border-bottom-color: @popover-arrow-outer-color;
-      top: -1px;
-      left: -@popover-arrow-outer-width;
-    }
-  }
-  &.left .arrow {
-    top: 50%;
-    right: -@popover-arrow-width;
-    margin-top: -@popover-arrow-width;
-    border-width: @popover-arrow-width 0 @popover-arrow-width @popover-arrow-width;
-    border-left-color: @popover-arrow-color;
-    &:after {
-      border-width: @popover-arrow-outer-width 0 @popover-arrow-outer-width @popover-arrow-outer-width;
-      border-left-color: @popover-arrow-outer-color;
-      bottom: -@popover-arrow-outer-width;
-      right: -1px;
-    }
-  }*/
 }
diff --git a/less/tests/buttons.html b/less/tests/buttons.html
index add63b4c9..5025655f8 100644
--- a/less/tests/buttons.html
+++ b/less/tests/buttons.html
@@ -23,11 +23,11 @@
     <![endif]-->
 
     <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
     <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
+      <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
+                    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
+                                   <link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
   </head>
 
   <body>
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index c1066741c..7af759f48 100644
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -22,11 +22,11 @@
     <![endif]-->
 
     <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
     <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
+      <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
+                    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
+                                   <link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
   </head>
 
   <body>
diff --git a/less/tests/forms-responsive.html b/less/tests/forms-responsive.html
index 7a8f8925f..ee9c6822e 100644
--- a/less/tests/forms-responsive.html
+++ b/less/tests/forms-responsive.html
@@ -23,11 +23,11 @@
     <![endif]-->
 
     <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
     <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
+      <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
+                    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
+                                   <link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
   </head>
 
   <body>
diff --git a/less/tests/navbar-fixed-top.html b/less/tests/navbar-fixed-top.html
index 9acf367e1..a4765474b 100644
--- a/less/tests/navbar-fixed-top.html
+++ b/less/tests/navbar-fixed-top.html
@@ -23,11 +23,11 @@
     <![endif]-->
 
     <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
     <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
+      <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
+                    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
+                                   <link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
   </head>
 
   <body>
diff --git a/less/tests/navbar-static-top.html b/less/tests/navbar-static-top.html
index 52928e464..5ba478241 100644
--- a/less/tests/navbar-static-top.html
+++ b/less/tests/navbar-static-top.html
@@ -25,11 +25,11 @@
     <![endif]-->
 
     <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
     <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
+      <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
+                    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
+                                   <link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
   </head>
 
   <body>
diff --git a/less/tests/navbar.html b/less/tests/navbar.html
index 3240aff8f..3399ccf13 100644
--- a/less/tests/navbar.html
+++ b/less/tests/navbar.html
@@ -26,11 +26,11 @@
     <![endif]-->
 
     <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
     <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
-    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
+      <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
+                    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
+                                   <link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
   </head>
 
   <body>