diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-16 15:31:38 -0500 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-16 15:31:38 -0500 |
| commit | 8da2815e47704b84610b65fecbbd29527c5abce6 (patch) | |
| tree | eb636d2b90ea67836f34604e273917df6bc8beee /docs/migration.md | |
| parent | a85b80fa75aa9ecc7da252411f6209a002e4bdfb (diff) | |
| parent | 8167682deb6146e1949cb49baf6e87d350befe3d (diff) | |
| download | bootstrap-8da2815e47704b84610b65fecbbd29527c5abce6.tar.xz bootstrap-8da2815e47704b84610b65fecbbd29527c5abce6.zip | |
Merge branch 'twbs/v4-dev' into dropdown-keyboard
Diffstat (limited to 'docs/migration.md')
| -rw-r--r-- | docs/migration.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/migration.md b/docs/migration.md index cb4b13410..5e623317e 100644 --- a/docs/migration.md +++ b/docs/migration.md @@ -170,11 +170,11 @@ The navbar has been entirely rewritten in flexbox with improved support for alig - An explicit class, `.breadcrumb-item`, is now required on the descendants of `.breadcrumb`s -### Labels, badges, and tags +### Labels and badges -- Renamed `.label` to `.tag` to disambiguate from the `<label>` element. -- Dropped the `.badge` component as it was nearly identical to labels/tags. Use the `.tag-pill` modifier together with the label component instead for that rounded look. -- Tags are no longer floated automatically in list groups and other components. Utility classes are now required for that. +- Renamed `.label` to `.badge` to disambiguate from the `<label>` element. +- Dropped the `.badge` component as it was nearly identical to labels. Use the `.badge-pill` modifier together with the label component instead for that rounded look. +- Badges are no longer floated automatically in list groups and other components. Utility classes are now required for that. ### Panels, thumbnails, and wells |