diff options
| author | Mark Otto <[email protected]> | 2016-02-06 15:58:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-02-06 15:58:40 -0800 |
| commit | 442277ddce7a254d0b20aecaf88c2adbf437eb38 (patch) | |
| tree | 5ab9ab53de4f743141e6a94a96f735ae046e5f79 /docs | |
| parent | b72e4ed8d675fe197d3ebdd69225eaecdd62e02e (diff) | |
| parent | 856e21757431ca6c1bbe9e183708ec7174fa73a1 (diff) | |
| download | bootstrap-442277ddce7a254d0b20aecaf88c2adbf437eb38.tar.xz bootstrap-442277ddce7a254d0b20aecaf88c2adbf437eb38.zip | |
Merge branch 'v4-dev' into v4-center-utils
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/content/typography.md | 5 | ||||
| -rw-r--r-- | docs/migration.md | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/docs/content/typography.md b/docs/content/typography.md index 045620584..2c0207375 100644 --- a/docs/content/typography.md +++ b/docs/content/typography.md @@ -22,7 +22,6 @@ Bootstrap sets basic global display, typography, and link styles. Specifically, These styles can be found within `_reboot.scss`, and the global variables are defined in `_variables.scss`. - ## Headings All HTML headings, `<h1>` through `<h6>`, are available. `.h1` through `.h6` classes are also available, for when you want to match the font styling of a heading but still want your text to be displayed inline. @@ -137,6 +136,10 @@ Styling for common inline HTML5 elements. While not shown above, feel free to use `<b>` and `<i>` in HTML5. `<b>` is meant to highlight words or phrases without conveying additional importance while `<i>` is mostly for voice, technical terms, etc. +## Text utilities + +Change text alignment, transform, style, weight, and color with our [text utilities](http://localhost:9001/components/utilities/#text-alignment). + ## Abbreviations Stylized implementation of HTML's `<abbr>` 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. diff --git a/docs/migration.md b/docs/migration.md index 05f15a28f..774dd1166 100644 --- a/docs/migration.md +++ b/docs/migration.md @@ -154,8 +154,8 @@ Dropped entirely for the new card component. ### Utilities -- Added `.pull-{xs,sm,md,lg,xl}-{left,right,none}` classes for responsive floats. -- Removed `.pull-left` and `.pull-right` since they're redundant to `.pull-xs-left` and `.pull-xs-right`. +- Added `.pull-{xs,sm,md,lg,xl}-{left,right,none}` classes for responsive floats and removed `.pull-left` and `.pull-right` since they're redundant to `.pull-xs-left` and `.pull-xs-right`. +- Added responsive variations to our text alignment classes `.text-{xs,sm,md,lg,xl}-{left,center,right}` and removed the redundant `.text-{left,center,right}` utilities as they are the same as the `xs` variation. - Dropped `.center-block` for the new `.m-x-auto` class. ### Vendor prefix mixins |