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 | |
| 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')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 57364 -> 57396 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 18 | ||||
| -rw-r--r-- | docs/base-css.html | 8 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 8 |
4 files changed, 28 insertions, 6 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 95241ab82..23fa44936 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index bc0592563..dd141c599 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1048,9 +1048,10 @@ select:focus:required:invalid:focus { .input-append .add-on, .input-prepend .btn, .input-append .btn { - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; + margin-left: -1px; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .input-prepend .active, .input-append .active { @@ -1061,6 +1062,12 @@ select:focus:required:invalid:focus { .input-prepend .btn { 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 select, .input-append .uneditable-input { @@ -1072,9 +1079,8 @@ select:focus:required:invalid:focus { border-left-color: #eee; border-right-color: #ccc; } -.input-append .add-on, -.input-append .btn { - margin-left: -1px; +.input-append .add-on:last-child, +.input-append .btn:last-child { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; diff --git a/docs/base-css.html b/docs/base-css.html index 647b396c6..05ef04b7e 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1224,6 +1224,14 @@ For example, <code>section</code> should be wrapped as inline. </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"> <label class="checkbox inline"> 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"> |