diff --git a/docs/components/reboot.md b/docs/components/reboot.md index 453665762a..c01f60cef8 100644 --- a/docs/components/reboot.md +++ b/docs/components/reboot.md @@ -244,7 +244,7 @@ These changes, and more, are demonstrated below. ### Address -The `
` element is updated to reset the browser default `font-style` from `italic` to `normal`. `line-height` is also now inherited, and `margin-bottom: 1rem` has been added. +The `
` element is updated to reset the browser default `font-style` from `italic` to `normal`. `line-height` is also now inherited, and `margin-bottom: 1rem` has been added. `
`s are for presenting contact information for the nearest ancestor (or an entire body of work). Preserve formatting by ending lines with `
`.
diff --git a/docs/components/typography.md b/docs/components/typography.md index ece703adc5..4c94349ae1 100644 --- a/docs/components/typography.md +++ b/docs/components/typography.md @@ -3,7 +3,7 @@ layout: page title: Typography --- -Bootstrap includes simple and easily customized typography across the project. In addition to the standard headings, body text, and lists, utility classes are also included. +Bootstrap includes simple and easily customized typography for headings, body text, lists, and more. For even more control, check out the [textual utility classes](/components/utilities/). ## Global settings @@ -96,16 +96,6 @@ Create lighter, secondary text in any heading with a generic `` tag or th
h6. Bootstrap heading Secondary text
{% endhighlight %} -## Body copy - -Bootstrap's base text is sized with global `font-size: 16px;` and `line-height: 1.5;`. This is applied to the `` and all paragraphs. - -{% example html %} -

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.

-

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.

-

Maecenas sed diam eget risus varius blandit sit amet non magna. Donec id elit non mi porta gravida at eget metus. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

-{% endexample %} - ## Lead Make a paragraph stand out by adding `.lead`. @@ -137,45 +127,16 @@ While not shown above, feel free to use `` and `` in HTML5. `` is meant Stylized implementation of HTML's `` element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a `title` attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover and to users of assistive technologies. -### Basic abbreviation - -{% example html %} -attr -{% endexample %} - -### Initialism - Add `.initialism` to an abbreviation for a slightly smaller font-size. {% example html %} -HTML -{% endexample %} - -## Address - -Present contact information for the nearest ancestor or the entire body of work. Preserve formatting by ending all lines with `
`. - -{% example html %} -
- Twitter, Inc.
- 795 Folsom Ave, Suite 600
- San Francisco, CA 94107
- P: (123) 456-7890 -
- -
- Full Name
- first.last@example.com -
+

attr

+

HTML

{% endexample %} ## Blockquotes -For quoting blocks of content from another source within your document. - -### Default blockquote - -Wrap `
` around any HTML as the quote. For straight quotes, we recommend a `

`. +For quoting blocks of content from another source within your document. Wrap `

` around any HTML as the quote. For straight quotes, we recommend a `

`. {% example html %}

@@ -183,11 +144,7 @@ Wrap `
` around any HTML {% endexample %} -### Blockquote options - -Style and content changes for simple variations on a standard `
`. - -#### Naming a source +### Naming a source Add a `
` for identifying the source. Wrap the name of the source work in ``. @@ -198,7 +155,7 @@ Add a `
` for identifying the source. Wrap the name of the source work in
{% endexample %} -#### Reverse layout +### Reverse layout Add `.blockquote-reverse` for a blockquote with right-aligned content. @@ -211,48 +168,6 @@ Add `.blockquote-reverse` for a blockquote with right-aligned content. ## Lists -### Unordered - -A list of items in which the order does *not* explicitly matter. - -{% example html %} -
    -
  • Lorem ipsum dolor sit amet
    • -
  • Nulla volutpat aliquam velit -
      -
    • Phasellus iaculis neque
      • -
    • Purus sodales ultricies
      • -
    • Vestibulum laoreet porttitor sem
      • -
    • Ac tristique libero volutpat at
      • -
    -
    • -
  • Faucibus porta lacus fringilla vel
    • -
  • Aenean sit amet erat nunc
    • -
  • Eget porttitor lorem
    • -
-{% endexample %} - -### Ordered - -A list of items in which the order *does* explicitly matter. - -{% example html %} -
    -
  1. Lorem ipsum dolor sit amet
    2. -
  2. Nulla volutpat aliquam velit -
      -
    1. Phasellus iaculis neque
      2. -
    2. Purus sodales ultricies
      3. -
    3. Vestibulum laoreet porttitor sem
      4. -
    4. Ac tristique libero volutpat at
      5. -
    -
    3. -
  3. Faucibus porta lacus fringilla vel
    4. -
  4. Aenean sit amet erat nunc
    5. -
  5. Eget porttitor lorem
    6. -
-{% endexample %} - ### Unstyled Remove the default `list-style` and left margin on list items (immediate children only). **This only applies to immediate children list items**, meaning you will need to add the class for any nested lists as well. @@ -289,22 +204,6 @@ Place all list items on a single line with `display: inline-block;` and some lig {% endexample %} -### Description - -A list of terms with their associated descriptions. - -{% example html %} -
-
Description lists
-
A description list is perfect for defining terms.
-
Euismod
-
Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
-
Donec id elit non mi porta gravida at eget metus.
-
Malesuada porta
-
Etiam porta sem malesuada magna mollis euismod.
-
-{% endexample %} - ### Horizontal description Align terms and descriptions horizontally by using our grid system's predefined classes (or semantic mixins). For longer terms, you can optionally add a `.text-truncate` class to truncate the text with an ellipsis.