diff options
| author | Mark Otto <[email protected]> | 2012-07-09 00:14:35 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-07-09 00:14:35 -0700 |
| commit | 8b696ad0b5fda07599bc3a865b1f2659345add3b (patch) | |
| tree | cef1340e70bb1276971ecc668ed790f66adf9f3b /docs | |
| parent | db9925510ba9328f227e5ad3935f73e0c67904d8 (diff) | |
| download | bootstrap-8b696ad0b5fda07599bc3a865b1f2659345add3b.tar.xz bootstrap-8b696ad0b5fda07599bc3a865b1f2659345add3b.zip | |
fix text in docs about default font-size and line-height
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 1 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5af92fad1..61398812e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5198,6 +5198,7 @@ a.badge:hover { .carousel { position: relative; + display: table; margin-bottom: 20px; line-height: 1; } diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 8985e7c69..a474ac861 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -54,7 +54,7 @@ {{! Body copy }} <h2>{{_i}}Body copy{{/i}}</h2> - <p>{{_i}}Bootstrap's global default <code>font-size</code> is <strong>13px</strong>, with a <code>line-height</code> of <strong>18px</strong>. This is applied to the <code><body></code> and all paragraphs. In addition, <code><p></code> (paragraphs) receive a bottom margin of half their line-height (9px by default).{{/i}}</p> + <p>{{_i}}Bootstrap's global default <code>font-size</code> is <strong>14px</strong>, with a <code>line-height</code> of <strong>20px</strong>. This is applied to the <code><body></code> and all paragraphs. In addition, <code><p></code> (paragraphs) receive a bottom margin of half their line-height (9px by default).{{/i}}</p> <div class="bs-docs-example"> <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.</p> <p>Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.</p> |