Skip to content

Fix git conflicts after #30571 #31982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
XhmikosR merged 3 commits into from
Oct 27, 2020
Merged

Fix git conflicts after #30571 #31982

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eca1f28
Remove git conflicts
MartijnCuppens Oct 27, 2020
98b5617
Update migration.md
XhmikosR Oct 27, 2020
c36e6ea
Merge branch 'main' into main-mc-migrations-fix
XhmikosR Oct 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions site/content/docs/5.0/migration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down