Remove support for multiple buttons in input groups because fuck that shit.

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d7fc04bfecae80b8fba0d4c456fb96f820836825..ce707c9f2c6b5ffd7a651724cc49d567ec021fd0 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1424,22 +1424,22 @@ select:focus:invalid:focus {
   display: table-cell;
 }
 
-.input-group-btn:first-child > .btn:last-child,
+.input-group-btn:first-child > .btn,
 .input-group-btn.btn-group:first-child > .btn {
   border-right: 0;
 }
 
-.input-group-btn:first-child > .btn:first-child,
+.input-group-btn:first-child > .btn,
 .input-group-btn.btn-group:first-child > .btn {
   border-radius: 4px 0 0 4px;
 }
 
-.input-group-btn:last-child > .btn:first-child,
+.input-group-btn:last-child > .btn,
 .input-group-btn.btn-group:last-child > .btn:first-child {
   border-left: 0;
 }
 
-.input-group-btn:last-child > .btn:last-child,
+.input-group-btn:last-child > .btn,
 .input-group-btn.btn-group:last-child > .btn {
   border-radius: 0 4px 4px 0;
 }

diff --git a/docs/css.html b/docs/css.html
index e6506c432b54e1329a0f1d503adddb7c949f3166..01410e0c4c27bbf99114e26f0ea516b1a6c24653 100644 (file)
--- a/docs/css.html
+++ b/docs/css.html
@@ -1357,40 +1357,6 @@ For example, <code><section></code> should be wrapped as inlin
     <button class="btn" type="button">Go!</button>
   </span>
 </div>
-</pre>
-          <form class="bs-docs-example">
-            <div class="input-group span7">
-              <input type="text">
-              <span class="input-group-btn">
-                <button class="btn" type="button">Search</button>
-                <button class="btn" type="button">Options</button>
-              </span>
-            </div>
-            <br>
-            <div class="input-group span7">
-              <span class="input-group-btn">
-                <button class="btn" type="button">Search</button>
-                <button class="btn" type="button">Options</button>
-              </span>
-              <input type="text">
-            </div>
-          </form>
-<pre class="prettyprint linenums">
-&lt;div class="input-group span7"&gt;
-  &lt;input type="text"&gt;
-  &lt;span class="input-group-btn"&gt;
-    &lt;button class="btn" type="button"&gt;Search&lt;/button&gt;
-    &lt;button class="btn" type="button"&gt;Options&lt;/button&gt;
-  &lt;/span&gt;
-&lt;/div&gt;
-
-&lt;div class="input-group span7"&gt;
-  &lt;span class="input-group-btn"&gt;
-    &lt;button class="btn" type="button"&gt;Search&lt;/button&gt;
-    &lt;button class="btn" type="button"&gt;Options&lt;/button&gt;
-  &lt;/span&gt;
-  &lt;input type="text"&gt;
-&lt;/div&gt;
 </pre>
 
           <h4>Button dropdowns</h4>
@@ -1471,6 +1437,8 @@ For example, &lt;code&gt;&lt;section&gt;&lt;/code&gt; should be wrapped as inlin
               <input type="text" class="span3">
             </div>
 
+            <br>
+
             <div class="input-group span7">
               <input type="text">
               <div class="input-group-btn btn-group">

diff --git a/docs/templates/pages/css.mustache b/docs/templates/pages/css.mustache
index 3bfbb0280f3633d32f9e4e18f87a23cc64ff9073..49aaa3ef811178f415eb49f4755fa47f7bb89058 100644 (file)
--- a/docs/templates/pages/css.mustache
+++ b/docs/templates/pages/css.mustache
@@ -1297,40 +1297,6 @@ For example, <code><section></code> should be wrapped as inlin
     <button class="btn" type="button">Go!</button>
   </span>
 </div>
-</pre>
-          <form class="bs-docs-example">
-            <div class="input-group span7">
-              <input type="text">
-              <span class="input-group-btn">
-                <button class="btn" type="button">Search</button>
-                <button class="btn" type="button">Options</button>
-              </span>
-            </div>
-            <br>
-            <div class="input-group span7">
-              <span class="input-group-btn">
-                <button class="btn" type="button">Search</button>
-                <button class="btn" type="button">Options</button>
-              </span>
-              <input type="text">
-            </div>
-          </form>
-<pre class="prettyprint linenums">
-&lt;div class="input-group span7"&gt;
-  &lt;input type="text"&gt;
-  &lt;span class="input-group-btn"&gt;
-    &lt;button class="btn" type="button"&gt;Search&lt;/button&gt;
-    &lt;button class="btn" type="button"&gt;Options&lt;/button&gt;
-  &lt;/span&gt;
-&lt;/div&gt;
-
-&lt;div class="input-group span7"&gt;
-  &lt;span class="input-group-btn"&gt;
-    &lt;button class="btn" type="button"&gt;Search&lt;/button&gt;
-    &lt;button class="btn" type="button"&gt;Options&lt;/button&gt;
-  &lt;/span&gt;
-  &lt;input type="text"&gt;
-&lt;/div&gt;
 </pre>
 
           <h4>Button dropdowns</h4>

diff --git a/less/forms.less b/less/forms.less
index a10e57d02f604b440a9227ba3b37fd26134c4462..949418d9837baeeeb5cebf28f3a7ac37e23b0a9b 100644 (file)
--- a/less/forms.less
+++ b/less/forms.less
@@ -510,22 +510,22 @@ select:focus:invalid {
 }
 // Prepend
 .input-group-btn {
-  &:first-child > .btn:last-child,
+  &:first-child > .btn,
   &.btn-group:first-child > .btn {
     border-right: 0;
   }
-  &:first-child > .btn:first-child,
+  &:first-child > .btn,
   &.btn-group:first-child > .btn {
     border-radius: @border-radius-base 0 0 @border-radius-base;
   }
 }
 // Append
 .input-group-btn {
-  &:last-child > .btn:first-child,
+  &:last-child > .btn,
   &.btn-group:last-child > .btn:first-child {
     border-left: 0;
   }
-  &:last-child > .btn:last-child,
+  &:last-child > .btn,
   &.btn-group:last-child > .btn {
     border-radius: 0 @border-radius-base @border-radius-base 0;
   }