kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

fix conflicts, add docs example for two buttons on an append

Browse source
This commit is contained in:
Mark Otto 2012-04-07 16:44:03 -07:00
parent 1d30225e2c
commit 3ecf109835
4 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View file

Binary file not shown.

18
docs/assets/css/bootstrap.css vendored
View file

@ -1048,9 +1048,10 @@ select:focus:required:invalid:focus {
.input-append .add-on, .input-append .add-on,
.input-prepend .btn, .input-prepend .btn,
.input-append .btn { .input-append .btn {
-webkit-border-radius: 3px 0 0 3px; margin-left: -1px;
-moz-border-radius: 3px 0 0 3px; -webkit-border-radius: 0;
border-radius: 3px 0 0 3px; -moz-border-radius: 0;
border-radius: 0;
} }
.input-prepend .active, .input-prepend .active,
.input-append .active { .input-append .active {
@ -1061,6 +1062,12 @@ select:focus:required:invalid:focus {
.input-prepend .btn { .input-prepend .btn {
margin-right: -1px; margin-right: -1px;
} }
.input-prepend .add-on:first-child,
.input-prepend .btn:first-child {
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px;
}
.input-append input, .input-append input,
.input-append select, .input-append select,
.input-append .uneditable-input { .input-append .uneditable-input {
@ -1072,9 +1079,8 @@ select:focus:required:invalid:focus {
border-left-color: #eee; border-left-color: #eee;
border-right-color: #ccc; border-right-color: #ccc;
} }
.input-append .add-on, .input-append .add-on:last-child,
.input-append .btn { .input-append .btn:last-child {
margin-left: -1px;
-webkit-border-radius: 0 3px 3px 0; -webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0;

8
docs/base-css.html
View file

@ -1223,6 +1223,14 @@ For example, <code>section</code> should be wrapped as inline.
</div> </div>
</div> </div>
</div> </div>
<div class="control-group">
<label class="control-label" for="appendedPrependedInput">Append with two buttons</label>
<div class="controls">
<div class="input-append">
<input class="span2" id="appendedPrependedInput" size="16" type="text"><button class="btn" type="button">Search</button><button class="btn" type="button">Options</button>
</div>
</div>
</div>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inlineCheckboxes">Inline checkboxes</label> <label class="control-label" for="inlineCheckboxes">Inline checkboxes</label>
<div class="controls"> <div class="controls">

8
docs/templates/pages/base-css.mustache vendored
View file

@ -1146,6 +1146,14 @@
</div> </div>
</div> </div>
</div> </div>
<div class="control-group">
<label class="control-label" for="appendedPrependedInput">{{_i}}Append with two buttons{{/i}}</label>
<div class="controls">
<div class="input-append">
<input class="span2" id="appendedPrependedInput" size="16" type="text"><button class="btn" type="button">Search</button><button class="btn" type="button">Options</button>
</div>
</div>
</div>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inlineCheckboxes">{{_i}}Inline checkboxes{{/i}}</label> <label class="control-label" for="inlineCheckboxes">{{_i}}Inline checkboxes{{/i}}</label>
<div class="controls"> <div class="controls">