Commit 442277dd authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch 'v4-dev' into v4-center-utils

parents b72e4ed8 856e2175
Showing with 6 additions and 3 deletions
+6 -3
...@@ -22,7 +22,6 @@ Bootstrap sets basic global display, typography, and link styles. Specifically, ...@@ -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`. These styles can be found within `_reboot.scss`, and the global variables are defined in `_variables.scss`.
## Headings ## 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. 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. ...@@ -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. 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 ## 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. 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.
......
...@@ -154,8 +154,8 @@ Dropped entirely for the new card component. ...@@ -154,8 +154,8 @@ Dropped entirely for the new card component.
### Utilities ### Utilities
- Added `.pull-{xs,sm,md,lg,xl}-{left,right,none}` classes for responsive floats. - 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`.
- 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. - Dropped `.center-block` for the new `.m-x-auto` class.
### Vendor prefix mixins ### Vendor prefix mixins
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment