diff options
| author | Martijn Cuppens <martijn.cuppens@gmail.com> | 2020-10-27 12:36:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-27 12:36:58 +0300 |
| commit | 642f40db25b05f87de8fef841844593878fe66d8 (patch) | |
| tree | 552c8ea44baeb00f071cfcb8b3f20a1ea3a6eb05 /site/content | |
| parent | 0a61269da8d6d923b12ee58e9f9a1042fbcf8dda (diff) | |
Fix git conflicts after #30571 (#31982)
Co-authored-by: XhmikosR <xhmikosr@gmail.com>
Diffstat (limited to 'site/content')
| -rw-r--r-- | site/content/docs/5.0/migration.md | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/site/content/docs/5.0/migration.md b/site/content/docs/5.0/migration.md index 6e252b8e51..05851b184f 100644 --- a/site/content/docs/5.0/migration.md +++ b/site/content/docs/5.0/migration.md @@ -21,17 +21,12 @@ toc: true - Introduce `$enable-smooth-scroll`, which applies `scroll-behavior: smooth` globally—except for users asking for reduced motion through `prefers-reduced-motion` media query. [See #31877](https://github.com/twbs/bootstrap/pull/31877) -<<<<<<< HEAD ### Forms - The longstanding [Missing border radius on input group with validation feedback bug](https://github.com/twbs/bootstrap/issues/25110) is finally fixed by adding an additional `.has-validation` class to input groups with validation. ### Utilities -======= -### Utilities - ->>>>>>> Update migration guide for more details, splitting alpha 2 stuff back to the appropriate section in Migration guide - **Text utilities:** - Added `.fs-*` utilities for `font-size` utilities (with RFS enabled). These use the same scale as HTML's default headings (1-6, large to small), and can be modified via Sass map. - Renamed `.font-weight-*` utilities as `.fw-*` for brevity and consistency. |