diff options
| author | mrmrs <[email protected]> | 2014-03-09 16:40:40 -0700 |
|---|---|---|
| committer | mrmrs <[email protected]> | 2014-03-09 16:40:40 -0700 |
| commit | 0b415c6099af274e13564d429ed9551004c71b5e (patch) | |
| tree | 2ba50400477fcbbcd08358cb5bab1f5e573659e3 /docs/javascript.html | |
| parent | 71e9902d9a4ee0bf8bc94b4c3123a92a52d6ef65 (diff) | |
| parent | 4bf0645060fb421c9b9f6f3309aceb42dd6e3407 (diff) | |
| download | bootstrap-0b415c6099af274e13564d429ed9551004c71b5e.tar.xz bootstrap-0b415c6099af274e13564d429ed9551004c71b5e.zip | |
Merge branch 'master' into mixin-table-of-contents
* master:
Fix bad grunt merge and then G R U N T
Reorder the Gruntfile a bit
Fixes #12892: Link to one of the SO articles on Bootstrap modals and YouTube
Remove unneeded quotes.
Rename generateRawFilesJs to generateRawFiles
Remove redundant parens
Conflicts:
docs/assets/js/raw-files.min.js
test-infra/npm-shrinkwrap.canonical.json
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index d3eeeb5c2..798ac1110 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -231,13 +231,17 @@ $('#myModal').on('show.bs.modal', function (e) { </div> {% endhighlight %} - <div class="bs-callout bs-callout-warning"> <h4>Make modals accessible</h4> <p>Be sure to add <code>role="dialog"</code> to <code>.modal</code>, <code>aria-labelledby="myModalLabel"</code> attribute to reference the modal title, and <code>aria-hidden="true"</code> to tell assistive technologies to skip the modal's DOM elements.</p> <p>Additionally, you may give a description of your modal dialog with <code>aria-describedby</code> on <code>.modal</code>.</p> </div> + <div class="bs-callout bs-callout-info"> + <h4>Embedding YouTube videos</h4> + <p>Embedding YouTube videos in modals requires additional JavaScript not in Bootstrap to automatically stop playback and more. <a href="http://stackoverflow.com/questions/18622508/bootstrap-3-and-youtube-in-modal">See this helpful Stack Overflow post</a> for more information.</p> + </div> + <h2 id="modals-sizes">Optional sizes</h2> <p>Modals have two optional sizes, available via modifier classes to be placed on a <code>.modal-dialog</code>.</p> <div class="bs-example"> |