From 19a94d08d659d39e718efca95812cac2db178b15 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 19:33:14 -0800 Subject: [PATCH] Remove support for multiple buttons in input groups because fuck that shit. --- docs/assets/css/bootstrap.css | 8 +++---- docs/css.html | 36 ++----------------------------- docs/templates/pages/css.mustache | 34 ----------------------------- less/forms.less | 8 +++---- 4 files changed, 10 insertions(+), 76 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d7fc04bfec..ce707c9f2c 100644 --- 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 e6506c432b..01410e0c4c 100644 --- 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> - -
-
- - - - - -
-
-
- - - - - -
-
-
-<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>
-
-<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>
 

Button dropdowns

@@ -1471,6 +1437,8 @@ For example, <code><section></code> should be wrapped as inlin +
+
diff --git a/docs/templates/pages/css.mustache b/docs/templates/pages/css.mustache index 3bfbb0280f..49aaa3ef81 100644 --- 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> - -
-
- - - - - -
-
-
- - - - - -
-
-
-<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>
-
-<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>
 

Button dropdowns

diff --git a/less/forms.less b/less/forms.less index a10e57d02f..949418d983 100644 --- 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; }