diff options
| author | Johann-S <[email protected]> | 2017-08-29 21:32:52 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-08-29 21:32:52 +0200 |
| commit | 0b06ad69d2c3428b052ca228c0b12b45ab36ec55 (patch) | |
| tree | cfce8034c7a9a8819fe625867415c1c9e5f08586 /docs | |
| parent | 0fdbaaf8853b266f75777cf84295b1bfdedd8a8a (diff) | |
| parent | 1ea63d131279884ab3729111f22b455205eed6e7 (diff) | |
| download | bootstrap-0b06ad69d2c3428b052ca228c0b12b45ab36ec55.tar.xz bootstrap-0b06ad69d2c3428b052ca228c0b12b45ab36ec55.zip | |
Merge branch 'v4-dev' into patch-5
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/4.0/components/collapse.md | 2 | ||||
| -rw-r--r-- | docs/4.0/components/list-group.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/4.0/components/collapse.md b/docs/4.0/components/collapse.md index c77d436fb..9e889efb2 100644 --- a/docs/4.0/components/collapse.md +++ b/docs/4.0/components/collapse.md @@ -216,7 +216,7 @@ $('#myCollapsible').collapse({ #### `.collapse('toggle')` -Toggles a collapsible element to shown or hidden. **Returns to the caller before the collapsible element has actually been shown or hidden (i.e. before the `shown.bs.collapse` or `hidden.bs.collapse` event occurs). +Toggles a collapsible element to shown or hidden. **Returns to the caller before the collapsible element has actually been shown or hidden** (i.e. before the `shown.bs.collapse` or `hidden.bs.collapse` event occurs). #### `.collapse('show')` diff --git a/docs/4.0/components/list-group.md b/docs/4.0/components/list-group.md index 8dc25a0dc..5fad36d5a 100644 --- a/docs/4.0/components/list-group.md +++ b/docs/4.0/components/list-group.md @@ -56,7 +56,7 @@ Be sure to **not use the standard `.btn` classes here**. {% example html %} <div class="list-group"> - <a href="#" class="list-group-item active"> + <a href="#" class="list-group-item list-group-item-action active"> Cras justo odio </a> <a href="#" class="list-group-item list-group-item-action">Dapibus ac facilisis in</a> |