rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Mark Otto 2012-12-19 19:33:14 -08:00
parent 4c82dd3645
commit 19a94d08d6
4 changed files with 10 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/assets/css/bootstrap.css vendored
View File

@ -1424,22 +1424,22 @@ select:focus:invalid:focus {
display: table-cell; 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 { .input-group-btn.btn-group:first-child > .btn {
border-right: 0; 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 { .input-group-btn.btn-group:first-child > .btn {
border-radius: 4px 0 0 4px; 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 { .input-group-btn.btn-group:last-child > .btn:first-child {
border-left: 0; 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 { .input-group-btn.btn-group:last-child > .btn {
border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0;
} }

36
docs/css.html
View File

@ -1357,40 +1357,6 @@ For example, <code><section></code> should be wrapped as inlin
<button class="btn" type="button">Go!</button> <button class="btn" type="button">Go!</button>
</span> </span>
</div> </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> </pre>
<h4>Button dropdowns</h4> <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"> <input type="text" class="span3">
</div> </div>
<br>
<div class="input-group span7"> <div class="input-group span7">
<input type="text"> <input type="text">
<div class="input-group-btn btn-group"> <div class="input-group-btn btn-group">

34
docs/templates/pages/css.mustache vendored
View File

@ -1297,40 +1297,6 @@ For example, &lt;code&gt;&lt;section&gt;&lt;/code&gt; should be wrapped as inlin
&lt;button class="btn" type="button"&gt;Go!&lt;/button&gt; &lt;button class="btn" type="button"&gt;Go!&lt;/button&gt;
&lt;/span&gt; &lt;/span&gt;
&lt;/div&gt; &lt;/div&gt;
</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> </pre>
<h4>Button dropdowns</h4> <h4>Button dropdowns</h4>

8
less/forms.less
View File

@ -510,22 +510,22 @@ select:focus:invalid {
} }
// Prepend // Prepend
.input-group-btn { .input-group-btn {
&:first-child > .btn:last-child, &:first-child > .btn,
&.btn-group:first-child > .btn { &.btn-group:first-child > .btn {
border-right: 0; border-right: 0;
} }
&:first-child > .btn:first-child, &:first-child > .btn,
&.btn-group:first-child > .btn { &.btn-group:first-child > .btn {
border-radius: @border-radius-base 0 0 @border-radius-base; border-radius: @border-radius-base 0 0 @border-radius-base;
} }
} }
// Append // Append
.input-group-btn { .input-group-btn {
&:last-child > .btn:first-child, &:last-child > .btn,
&.btn-group:last-child > .btn:first-child { &.btn-group:last-child > .btn:first-child {
border-left: 0; border-left: 0;
} }
&:last-child > .btn:last-child, &:last-child > .btn,
&.btn-group:last-child > .btn { &.btn-group:last-child > .btn {
border-radius: 0 @border-radius-base @border-radius-base 0; border-radius: 0 @border-radius-base @border-radius-base 0;
} }