diff options
| author | Johann-S <[email protected]> | 2017-06-21 11:47:14 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-06-21 11:47:14 +0200 |
| commit | 38ddf9ec28235c1c1b6d9958248298a1f679db73 (patch) | |
| tree | 9e4e5851e5d40f64295cfd59cfc43ef6224dc14c /docs | |
| parent | 16d77b4cb07f575d45ae486125ea9df06bd45d3f (diff) | |
| download | bootstrap-38ddf9ec28235c1c1b6d9958248298a1f679db73.tar.xz bootstrap-38ddf9ec28235c1c1b6d9958248298a1f679db73.zip | |
Fix modal overflow with our navbar documentation and fix typo (#22864)
* Fix modal overflow with our navbar documentation and fix typo
* Fix z-index backdrop and modal with popover/tooltip example
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/4.0/components/modal.md | 4 | ||||
| -rw-r--r-- | docs/4.0/getting-started/webpack.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/4.0/components/modal.md b/docs/4.0/components/modal.md index 913f81eb0..25891bf40 100644 --- a/docs/4.0/components/modal.md +++ b/docs/4.0/components/modal.md @@ -226,10 +226,10 @@ When modals become too long for the user's viewport or device, they scroll indep </div> <div class="modal-body"> <h5>Popover in a modal</h5> - <p>This <a href="#" role="button" class="btn btn-secondary popover-test" title="Popover title" data-content="Popover body content is set in this attribute.">button</a> triggers a popover on click.</p> + <p>This <a href="#" role="button" class="btn btn-secondary popover-test" title="Popover title" data-content="Popover body content is set in this attribute." data-container="#exampleModalPopovers">button</a> triggers a popover on click.</p> <hr> <h5>Tooltips in a modal</h5> - <p><a href="#" class="tooltip-test" title="Tooltip">This link</a> and <a href="#" class="tooltip-test" title="Tooltip">that link</a> have tooltips on hover.</p> + <p><a href="#" class="tooltip-test" title="Tooltip" data-container="#exampleModalPopovers">This link</a> and <a href="#" class="tooltip-test" title="Tooltip" data-container="#exampleModalPopovers">that link</a> have tooltips on hover.</p> </div> <div class="modal-footer"> <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> diff --git a/docs/4.0/getting-started/webpack.md b/docs/4.0/getting-started/webpack.md index b22fad36d..84ad74c7f 100644 --- a/docs/4.0/getting-started/webpack.md +++ b/docs/4.0/getting-started/webpack.md @@ -12,7 +12,7 @@ toc: true ## Importing JavaScript -Import [Bootstrap's JavaScript](/getting-started/javascript/) by adding this line to your app's entry point (usally `index.js` or `app.js`): +Import [Bootstrap's JavaScript](/getting-started/javascript/) by adding this line to your app's entry point (usually `index.js` or `app.js`): {% highlight js %} import 'bootstrap'; |