diff options
| author | Jacob Thornton <[email protected]> | 2012-01-02 16:04:35 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-02 16:04:35 -0800 |
| commit | f8c0efbcb45ba81204488b398d1d8ef2950850c6 (patch) | |
| tree | d41b2270d570ac0ee684664f84c53a1379fcfff1 /docs/base-css.html | |
| parent | 2d092dfeea969d82bc55a153c6a597a3e87a0a03 (diff) | |
| parent | 553030ca7de8dac3c5180629ff84fa14173513ab (diff) | |
| download | bootstrap-f8c0efbcb45ba81204488b398d1d8ef2950850c6.tar.xz bootstrap-f8c0efbcb45ba81204488b398d1d8ef2950850c6.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'docs/base-css.html')
| -rw-r--r-- | docs/base-css.html | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index dad42381d..2bc6f49fb 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -646,25 +646,24 @@ <tr> <td>1</td> <td colspan="2">Some One</td> - <td>English</td> + <td>HTML</td> </tr> <tr> <td>2</td> <td>Joe</td> <td>Sixpack</td> - <td>English</td> + <td rowspan="2">Javascript</td> </tr> </tr> <td>3</td> <td>Joe</td> <td>Sixpack</td> - <td>English</td> </tr> <tr> <td>3</td> <td>Stu</td> <td>Dent</td> - <td>Code</td> + <td>CSS</td> </tr> </tbody> </table> @@ -894,7 +893,17 @@ Form states <span class="add-on">@</span> <input class="input-small" id="prependedInput" name="prependedInput" size="16" type="text"> </div> - <span class="help-block">Here's some help text</span> + <p class="help-block">Here's some help text</p> + </div> + </fieldset> + <fieldset class="control-group"> + <label class="control-label" for="appendedInput">Appended text</label> + <div class="controls"> + <div class="input-append"> + <input class="input-small" id="appendedInput" name="appendedInput" size="16" type="text"> + <span class="add-on">.00</span> + </div> + <p class="help-block">Here's more help text</p> </div> </fieldset> <fieldset class="control-group"> |