diff options
| author | Jacob Thornton <[email protected]> | 2012-04-04 15:13:27 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-04-04 15:13:27 -0700 |
| commit | 4953629ccd0a1c43ae483a843db6d882fe66fc03 (patch) | |
| tree | 22420388e754c7ed67fdb7256cefe62023a0ca08 /docs/base-css.html | |
| parent | 83febb3452ecd81241ddc004509ec64de8b13a92 (diff) | |
| parent | 2ea437f353a636a277320513db04ced4fc0f7da2 (diff) | |
| download | bootstrap-4953629ccd0a1c43ae483a843db6d882fe66fc03.tar.xz bootstrap-4953629ccd0a1c43ae483a843db6d882fe66fc03.zip | |
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/base-css.html')
| -rw-r--r-- | docs/base-css.html | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index 0a1ea0d9d..647b396c6 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -371,7 +371,14 @@ <dd>Donec id elit non mi porta gravida at eget metus.</dd> <dt>Malesuada porta</dt> <dd>Etiam porta sem malesuada magna mollis euismod.</dd> + <dt>Felis euismod semper eget lacinia</dt> + <dd>Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</dd> </dl> + <hr> + <p> + <span class="label label-info">Heads up!</span> + Horizontal description lists will truncate terms that are too long to fit in the left column fix <code>text-overflow</code>. In narrower viewports, they will change to the default stacked layout. + </p> </div> </div><!-- /row --> </section> |