From: Mark Otto <otto@github.com>
Date: Fri, 23 Nov 2012 06:04:21 +0000 (-0800)
Subject: Merge branch '2.2.2-wip' into exploratory
X-Git-Tag: v3.0.0-rc1~883
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e56e2265d67ae81ad8be52af4d56f189929207a;p=thirdparty%2Fbootstrap.git

Merge branch '2.2.2-wip' into exploratory

Conflicts:
	less/button-groups.less
---

7e56e2265d67ae81ad8be52af4d56f189929207a
diff --cc docs/index.html
index 8fd7f2b1a6,ec26060852..5ab9933820
--- a/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/templates/pages/index.mustache
index b7f112cb17,9ee966d0fb..50ec7be152
--- a/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 less/button-groups.less
index 8a74b9e75e,8c3b9ff045..7b7c779ae6
--- a/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;
  }