Merge branch '2.2.2-wip' into exploratory

Conflicts:
	less/button-groups.less

diff --cc docs/assets/css/bootstrap.css
Simple merge

diff --cc docs/assets/css/docs.css
Simple merge

diff --cc docs/base-css.html
Simple merge

diff --cc docs/components.html
Simple merge

diff --cc docs/customize.html
Simple merge

diff --cc docs/extend.html
Simple merge

diff --cc docs/getting-started.html
Simple merge

diff --cc docs/index.html
index 8fd7f2b1a6e26a7e0b11d925234955da77fe8d0f,ec260608520d6a9479a833dcac6e02149e9c9b90..5ab9933820f8e2398b69a49bc0ba48f1a897411c
--- 1/docs/index.html
--- 2/docs/index.html
+++ b/docs/index.html
@@@ -116,19 -119,19 +116,19 @@@
      <h1>Introducing Bootstrap.</h1>
      <p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
  
 -    <div class="row-fluid">
 +    <div class="row">
        <div class="span4">
-         <img src="assets/img/bs-docs-twitter-github.png">
+         <img class="marketing-img" src="assets/img/bs-docs-twitter-github.png">
          <h2>By nerds, for nerds.</h2>
          <p>Built at Twitter by <a href="http://twitter.com/mdo">@mdo</a> and <a href="http://twitter.com/fat">@fat</a>, Bootstrap utilizes <a href="http://lesscss.org">LESS CSS</a>, is compiled via <a href="http://nodejs.org">Node</a>, and is managed through <a href="http://github.com">GitHub</a> to help nerds do awesome stuff on the web.</p>
        </div>
        <div class="span4">
-         <img src="assets/img/bs-docs-responsive-illustrations.png">
+         <img class="marketing-img" src="assets/img/bs-docs-responsive-illustrations.png">
          <h2>Made for everyone.</h2>
 -        <p>Bootstrap was made to not only look and behave great in the latest desktop browsers (as well as IE7!), but in tablet and smartphone browsers via <a href="./scaffolding.html#responsive">responsive CSS</a> as well.</p>
 +        <p>Bootstrap was made to not only look and behave great in the latest desktop browsers (including IE8+), but in tablet and smartphone browsers via <a href="./scaffolding.html#responsive">responsive CSS</a> as well.</p>
        </div>
        <div class="span4">
-         <img src="assets/img/bs-docs-bootstrap-features.png">
+         <img class="marketing-img" src="assets/img/bs-docs-bootstrap-features.png">
          <h2>Packed with features.</h2>
          <p>A 12-column responsive <a href="./scaffolding.html#grid">grid</a>, dozens of components, <a href="./javascript.html">JavaScript plugins</a>, typography, form controls, and even a <a href="./customize.html">web-based Customizer</a> to make Bootstrap your own.</p>
        </div>

diff --cc docs/javascript.html
Simple merge

diff --cc docs/scaffolding.html
Simple merge

diff --cc docs/templates/layout.mustache
Simple merge

diff --cc docs/templates/pages/index.mustache
index b7f112cb17707b9b3da779ab9a9b61cc50288e49,9ee966d0fb639f6042ab5bd2ca1a79bb408604af..50ec7be152b0d340bffb4d1fcfd2ffb47e0451f6
--- 1/docs/templates/pages/index.mustache
--- 2/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@@ -48,19 -48,19 +48,19 @@@
      <h1>{{_i}}Introducing Bootstrap.{{/i}}</h1>
      <p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p>
  
 -    <div class="row-fluid">
 +    <div class="row">
        <div class="span4">
-         <img src="assets/img/bs-docs-twitter-github.png">
+         <img class="marketing-img" src="assets/img/bs-docs-twitter-github.png">
          <h2>{{_i}}By nerds, for nerds.{{/i}}</h2>
          <p>{{_i}}Built at Twitter by <a href="http://twitter.com/mdo">@mdo</a> and <a href="http://twitter.com/fat">@fat</a>, Bootstrap utilizes <a href="http://lesscss.org">LESS CSS</a>, is compiled via <a href="http://nodejs.org">Node</a>, and is managed through <a href="http://github.com">GitHub</a> to help nerds do awesome stuff on the web.{{/i}}</p>
        </div>
        <div class="span4">
-         <img src="assets/img/bs-docs-responsive-illustrations.png">
+         <img class="marketing-img" src="assets/img/bs-docs-responsive-illustrations.png">
          <h2>{{_i}}Made for everyone.{{/i}}</h2>
 -        <p>{{_i}}Bootstrap was made to not only look and behave great in the latest desktop browsers (as well as IE7!), but in tablet and smartphone browsers via <a href="./scaffolding.html#responsive">responsive CSS</a> as well.{{/i}}</p>
 +        <p>{{_i}}Bootstrap was made to not only look and behave great in the latest desktop browsers (including IE8+), but in tablet and smartphone browsers via <a href="./scaffolding.html#responsive">responsive CSS</a> as well.{{/i}}</p>
        </div>
        <div class="span4">
-         <img src="assets/img/bs-docs-bootstrap-features.png">
+         <img class="marketing-img" src="assets/img/bs-docs-bootstrap-features.png">
          <h2>{{_i}}Packed with features.{{/i}}</h2>
          <p>{{_i}}A 12-column responsive <a href="./scaffolding.html#grid">grid</a>, dozens of components, <a href="./javascript.html">JavaScript plugins</a>, typography, form controls, and even a <a href="./customize.html">web-based Customizer</a> to make Bootstrap your own.{{/i}}</p>
        </div>

diff --cc docs/templates/pages/javascript.mustache
Simple merge

diff --cc less/button-groups.less
index 8a74b9e75e81d6a4145b538a7179f3942318c001,8c3b9ff045797822c418ad00c60c577d5e330950..7b7c779ae6bd28c51e7a4583902b162d5da02b96
--- 1/less/button-groups.less
--- 2/less/button-groups.less
+++ b/less/button-groups.less
@@@ -200,14 -213,14 +200,14 @@@
    margin-top: -1px;
  }
  .btn-group-vertical .btn:first-child {
-   border-radius: 4px 4px 0 0;
 -  .border-radius(@baseBorderRadius @baseBorderRadius 0 0);
++  border-radius: @baseBorderRadius @baseBorderRadius 0 0;
  }
  .btn-group-vertical .btn:last-child {
-   border-radius: 0 0 4px 4px;
 -  .border-radius(0 0 @baseBorderRadius @baseBorderRadius);
++  border-radius: 0 0 @baseBorderRadius @baseBorderRadius;
  }
  .btn-group-vertical .btn-large:first-child {
-   border-radius: 6px 6px 0 0;
 -  .border-radius(@borderRadiusLarge @borderRadiusLarge 0 0);
++  border-radius: @borderRadiusLarge @borderRadiusLarge 0 0;
  }
  .btn-group-vertical .btn-large:last-child {
-   border-radius: 0 0 6px 6px;
 -  .border-radius(0 0 @borderRadiusLarge @borderRadiusLarge);
++  border-radius: 0 0 @borderRadiusLarge @borderRadiusLarge;
  }

diff --cc less/mixins.less
Simple merge

diff --cc less/navbar.less
Simple merge

diff --cc less/reset.less
Simple merge