aboutsummaryrefslogtreecommitdiff
path: root/docs/migration.md
diff options
context:
space:
mode:
authorPierre-Denis Vanduynslager <[email protected]>2017-01-06 15:57:15 -0500
committerPierre-Denis Vanduynslager <[email protected]>2017-01-06 15:57:15 -0500
commit4c2f5443596c39c551ebb7ec635d01a98e434189 (patch)
tree3bb7d0a5bcd80e2758578c8d597c7554d7fd4b0c /docs/migration.md
parenteb84c03ddf5993d701724250507055b4e394fbdb (diff)
parent65ffb1c3b6e94440812a2e228cb8e8be512652ec (diff)
downloadbootstrap-4c2f5443596c39c551ebb7ec635d01a98e434189.tar.xz
bootstrap-4c2f5443596c39c551ebb7ec635d01a98e434189.zip
Merge branch 'twbs/v4-dev' into dropdown-keyboard
Diffstat (limited to 'docs/migration.md')
-rw-r--r--docs/migration.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/migration.md b/docs/migration.md
index ee3ecb125..cb4b13410 100644
--- a/docs/migration.md
+++ b/docs/migration.md
@@ -44,7 +44,7 @@ Here are the big ticket items you'll want to be aware of when moving from v3 to
- Dropped the Glyphicons icon font. If you need icons, some options are:
- the upstream version of [Glyphicons](https://glyphicons.com/)
- [Octicons](https://octicons.github.com/)
- - [Font Awesome](https://fortawesome.github.io/Font-Awesome/)
+ - [Font Awesome](http://fontawesome.io/)
- Dropped the Affix jQuery plugin. We recommend using a `position: sticky` polyfill instead. [See the HTML5 Please entry](http://html5please.com/#sticky) for details and specific polyfill recommendations.
- If you were using Affix to apply additional, non-`position` styles, the polyfills might not support your use case. One option for such uses is the third-party [ScrollPos-Styler](https://github.com/acch/scrollpos-styler) library.
- Dropped the pager component as it was essentially slightly customized buttons.
@@ -125,7 +125,7 @@ New to Bootstrap 4 is the Reboot, a new stylesheet that builds on Normalize with
### Grid system
- Added a new `576px` grid breakpoint as `sm`, meaning there are now five total tiers (`xs`, `sm`, `md`, `lg`, and `xl`).
-- Renamed the responsive grid modifier classes from `.col-{breakpoint}-{modifier}-{size}` to `.{modifier}-{breakpoint}-{size}` for simpler grid classes. For example, instead of `.col-md-3.col-md-push-9` it's `col-md-3.push-md-9`.
+- Renamed the responsive grid modifier classes from `.col-{breakpoint}-{modifier}-{size}` to `.{modifier}-{breakpoint}-{size}` for simpler grid classes. For example, instead of `.col-md-3.col-md-push-9` it's `.col-md-3.push-md-9`.
- Overhauled the grid mixins to merge `make-col` and `make-col-span` into a single `make-col` mixin, thereby ensuring mixins and predefined classes utilize the same float/flex behaviors.
- Added flexbox utility classes for grid system and components.