diff options
| author | Mark Otto <[email protected]> | 2012-04-07 16:44:03 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-04-07 16:44:03 -0700 |
| commit | 3ecf1098357618092280b2e7c562a1ef5bf11959 (patch) | |
| tree | b4432ce7385f8fe054902abc9303c4dc4dfc6dc3 /docs/templates | |
| parent | 1d30225e2c194e50840e002c085a998d3f3a33dc (diff) | |
| download | bootstrap-3ecf1098357618092280b2e7c562a1ef5bf11959.tar.xz bootstrap-3ecf1098357618092280b2e7c562a1ef5bf11959.zip | |
fix conflicts, add docs example for two buttons on an append
Diffstat (limited to 'docs/templates')
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 66bf70474..57e2401d1 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1147,6 +1147,14 @@ </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"> <label class="control-label" for="inlineCheckboxes">{{_i}}Inline checkboxes{{/i}}</label> <div class="controls"> <label class="checkbox inline"> |