aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorjipexu <[email protected]>2017-08-14 23:04:06 +0200
committerMark Otto <[email protected]>2017-08-14 14:04:06 -0700
commit20af0373f302a432357ae306e80a14ec24d57077 (patch)
tree3660cc2bf8cccaa2787774639a50b610c71b4dd7 /docs
parent6d6d42b56ac804fe25eac07e540992227095aad8 (diff)
downloadbootstrap-20af0373f302a432357ae306e80a14ec24d57077.tar.xz
bootstrap-20af0373f302a432357ae306e80a14ec24d57077.zip
Mention badge-default in migration docs, fix typo on popover docs (#23409)
Diffstat (limited to 'docs')
-rw-r--r--docs/4.0/components/popovers.md2
-rw-r--r--docs/4.0/migration.md1
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/4.0/components/popovers.md b/docs/4.0/components/popovers.md
index 32261eb6c..2e6f42b55 100644
--- a/docs/4.0/components/popovers.md
+++ b/docs/4.0/components/popovers.md
@@ -361,7 +361,7 @@ Updates the position of an element's popover.
</tr>
<tr>
<td>inserted.bs.popover</td>
- <td>This event is fired after the <code>show.bs.popover</code> event when the tooltip template has been added to the DOM.</td>
+ <td>This event is fired after the <code>show.bs.popover</code> event when the popover template has been added to the DOM.</td>
</tr>
</tbody>
</table>
diff --git a/docs/4.0/migration.md b/docs/4.0/migration.md
index a2cb9aea0..6a2420927 100644
--- a/docs/4.0/migration.md
+++ b/docs/4.0/migration.md
@@ -188,6 +188,7 @@ The navbar has been entirely rewritten in flexbox with improved support for alig
- 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.
+- `.badge-default` has been dropped and `.badge-secondary` added to match component modifier classes used elsewhere.
### Panels, thumbnails, and wells