diff options
| author | Mark Otto <[email protected]> | 2016-10-16 19:46:47 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-10-16 19:46:47 -0700 |
| commit | b4cdccba84f7681e2911d307828c5ce94c856736 (patch) | |
| tree | f8e1edddbd941adb255766889019248ffa399d0a /docs/content/typography.md | |
| parent | 05bdecd0b09a007ae949f49fdff9006650c06969 (diff) | |
| parent | 6d6538fc81ebdb9e29ca5a5a4e8e5768b9358fe9 (diff) | |
| download | bootstrap-b4cdccba84f7681e2911d307828c5ce94c856736.tar.xz bootstrap-b4cdccba84f7681e2911d307828c5ce94c856736.zip | |
Merge branch 'v4-dev' into v4-navbars
Diffstat (limited to 'docs/content/typography.md')
| -rw-r--r-- | docs/content/typography.md | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/docs/content/typography.md b/docs/content/typography.md index 139a7e00e..ae1378422 100644 --- a/docs/content/typography.md +++ b/docs/content/typography.md @@ -1,10 +1,11 @@ --- layout: docs title: Typography +description: Documentation and examples for Bootstrap typography, including global settings, body text, lists, and more. group: content --- -Bootstrap includes simple and easily customized typography for headings, body text, lists, and more. For even more control, check out the [textual utility classes]({{ site.baseurl }}/components/utilities/). +Bootstrap includes simple and easily customized typography for headings, body text, lists, and more. For even more control, check out the [textual utility classes]({{ site.baseurl }}/utilities/). ## Contents @@ -15,7 +16,7 @@ Bootstrap includes simple and easily customized typography for headings, body te Bootstrap sets basic global display, typography, and link styles. Specifically, we: -- Use a [native font stack](/content/reboot/#native-font-stack) that selects the best `font-family` for each OS and device. +- Use a [native font stack]({{ site.baseurl }}/content/reboot/#native-font-stack) that selects the best `font-family` for each OS and device. - Use the `$font-family-base`, `$font-size-base`, and `$line-height-base` attributes as our typographic base applied to the `<body>`. - Set the global link color via `$link-color` and apply link underlines only on `:hover`. - Use `$body-bg` to set a `background-color` on the `<body>` (`#fff` by default). @@ -31,27 +32,27 @@ All HTML headings, `<h1>` through `<h6>`, are available. <tbody> <tr> <td><h1>h1. Bootstrap heading</h1></td> - <td class="type-info">Semibold 36px</td> + <td class="type-info">Semibold 2.5rem (40px)</td> </tr> <tr> <td><h2>h2. Bootstrap heading</h2></td> - <td class="type-info">Semibold 30px</td> + <td class="type-info">Semibold 2rem (32px)</td> </tr> <tr> <td><h3>h3. Bootstrap heading</h3></td> - <td class="type-info">Semibold 24px</td> + <td class="type-info">Semibold 1.75rem (28px)</td> </tr> <tr> <td><h4>h4. Bootstrap heading</h4></td> - <td class="type-info">Semibold 18px</td> + <td class="type-info">Semibold 1.5rem (24px)</td> </tr> <tr> <td><h5>h5. Bootstrap heading</h5></td> - <td class="type-info">Semibold 14px</td> + <td class="type-info">Semibold 1.25rem (20px)</td> </tr> <tr> <td><h6>h6. Bootstrap heading</h6></td> - <td class="type-info">Semibold 12px</td> + <td class="type-info">Semibold 1rem (16px)</td> </tr> </tbody> </table> @@ -149,7 +150,7 @@ While not shown above, feel free to use `<b>` and `<i>` in HTML5. `<b>` is meant ## Text utilities -Change text alignment, transform, style, weight, and color with our [text utilities]({{ site.baseurl }}/components/utilities/#text-alignment). +Change text alignment, transform, style, weight, and color with our [text utilities]({{ site.baseurl }}/utilities/typography/#text-alignment). ## Abbreviations @@ -168,7 +169,7 @@ For quoting blocks of content from another source within your document. Wrap `<b {% example html %} <blockquote class="blockquote"> - <p class="m-b-0">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> + <p class="mb-0">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> </blockquote> {% endexample %} @@ -178,7 +179,7 @@ Add a `<footer class="blockquote-footer">` for identifying the source. Wrap the {% example html %} <blockquote class="blockquote"> - <p class="m-b-0">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> + <p class="mb-0">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> <footer class="blockquote-footer">Someone famous in <cite title="Source Title">Source Title</cite></footer> </blockquote> {% endexample %} @@ -189,7 +190,7 @@ Add `.blockquote-reverse` for a blockquote with right-aligned content. {% example html %} <blockquote class="blockquote blockquote-reverse"> - <p class="m-b-0">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> + <p class="mb-0">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> <footer class="blockquote-footer">Someone famous in <cite title="Source Title">Source Title</cite></footer> </blockquote> {% endexample %} |