mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00
Code 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
Download Patch File Download Diff File Expand all files Collapse all files
docs/base-css.html
+8
View File
@@ -1223,6 +1223,14 @@ For example, <code>section</code> should be wrapped as inline.
</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">
<label class="control-label" for="inlineCheckboxes">Inline checkboxes</label>
<div class="controls">