diff options
| author | Mark Otto <[email protected]> | 2012-12-19 19:33:14 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-19 19:33:14 -0800 |
| commit | 19a94d08d659d39e718efca95812cac2db178b15 (patch) | |
| tree | 7517fbd61b4af479844e53f34a50b3c8cc585ed3 | |
| parent | 4c82dd3645ec60277b07a161c779f57dda10037c (diff) | |
| download | bootstrap-19a94d08d659d39e718efca95812cac2db178b15.tar.xz bootstrap-19a94d08d659d39e718efca95812cac2db178b15.zip | |
Remove support for multiple buttons in input groups because fuck that shit.
| -rw-r--r-- | docs/assets/css/bootstrap.css | 8 | ||||
| -rw-r--r-- | docs/css.html | 36 | ||||
| -rw-r--r-- | docs/templates/pages/css.mustache | 34 | ||||
| -rw-r--r-- | 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 d7fc04bfe..ce707c9f2 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 e6506c432..01410e0c4 100644 --- a/docs/css.html +++ b/docs/css.html @@ -1358,40 +1358,6 @@ For example, <code><section></code> should be wrapped as inlin </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"> -<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> -</pre> <h4>Button dropdowns</h4> <p></p> @@ -1471,6 +1437,8 @@ For example, <code><section></code> 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 3bfbb0280..49aaa3ef8 100644 --- a/docs/templates/pages/css.mustache +++ b/docs/templates/pages/css.mustache @@ -1298,40 +1298,6 @@ For example, <code><section></code> should be wrapped as inlin </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"> -<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> -</pre> <h4>Button dropdowns</h4> <p></p> diff --git a/less/forms.less b/less/forms.less index a10e57d02..949418d98 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; } |
