aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-02-07 19:21:56 -0800
committerMark Otto <[email protected]>2013-02-07 19:21:56 -0800
commita623b8c10f4293bd40a1e7c144b61fe374179826 (patch)
treeecbdf98db088d58f40161bfec108b59a69bbbc8f /docs/javascript.html
parentcdb2147b132792dd29628055d0fd753ad6bf59a0 (diff)
downloadbootstrap-a623b8c10f4293bd40a1e7c144b61fe374179826.tar.xz
bootstrap-a623b8c10f4293bd40a1e7c144b61fe374179826.zip
update docs modals
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html96
1 files changed, 55 insertions, 41 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index 8f941f278..cc8e6961b 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -192,7 +192,7 @@ $('#myModal').on('show', function (e) {
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
- <h3 class="modal-title">Modal header</h3>
+ <h4 class="modal-title">Modal title</h4>
</div>
<div class="modal-body">
<p>One fine body&hellip;</p>
@@ -208,16 +208,22 @@ $('#myModal').on('show', function (e) {
</div>
<pre class="prettyprint linenums">
&lt;div class="modal fade"&gt;
- &lt;div class="modal-header"&gt;
- &lt;button type="button" class="close" data-dismiss="modal" aria-hidden="true"&gt;&amp;times;&lt;/button&gt;
- &lt;h3&gt;Modal header&lt;/h3&gt;
- &lt;/div&gt;
- &lt;div class="modal-body"&gt;
- &lt;p&gt;One fine body&hellip;&lt;/p&gt;
- &lt;/div&gt;
- &lt;div class="modal-footer"&gt;
- &lt;a href="#" class="btn"&gt;Close&lt;/a&gt;
- &lt;a href="#" class="btn btn-primary"&gt;Save changes&lt;/a&gt;
+ &lt;div class="modal-dialog"&gt;
+ &lt;div class="modal-content"&gt;
+
+ &lt;div class="modal-header"&gt;
+ &lt;button type="button" class="close" data-dismiss="modal" aria-hidden="true"&gt;&amp;times;&lt;/button&gt;
+ &lt;h4 class="modal-title"&gt;Modal title&lt;/h4&gt;
+ &lt;/div&gt;
+ &lt;div class="modal-body"&gt;
+ &lt;p&gt;One fine body&hellip;&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="modal-footer"&gt;
+ &lt;a href="#" class="btn"&gt;Close&lt;/a&gt;
+ &lt;a href="#" class="btn btn-primary"&gt;Save changes&lt;/a&gt;
+ &lt;/div&gt;
+
+ &lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
</pre>
@@ -226,36 +232,44 @@ $('#myModal').on('show', function (e) {
<p>Toggle a modal via JavaScript by clicking the button below. It will slide down and fade in from the top of the page.</p>
<!-- sample modal content -->
<div id="myModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
- <h3 id="myModalLabel">Modal Heading</h3>
- </div>
- <div class="modal-body">
- <h4>Text in a modal</h4>
- <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem.</p>
-
- <h4>Popover in a modal</h4>
- <p>This <a href="#" role="button" class="btn popover-test" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">button</a> should trigger a popover on click.</p>
-
- <h4>Tooltips in a modal</h4>
- <p><a href="#" class="tooltip-test" title="Tooltip">This link</a> and <a href="#" class="tooltip-test" title="Tooltip">that link</a> should have tooltips on hover.</p>
-
- <hr>
-
- <h4>Overflowing text to show optional scrollbar</h4>
- <p>We set a fixed <code>max-height</code> on the <code>.modal-body</code>. Watch it overflow with all this extra lorem ipsum text we've included.</p>
- <p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
- <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.</p>
- <p>Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.</p>
- <p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
- <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.</p>
- <p>Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.</p>
- </div>
- <div class="modal-footer">
- <button class="btn" data-dismiss="modal">Close</button>
- <button class="btn btn-primary">Save changes</button>
- </div>
- </div>
+
+ <div class="modal-dialog">
+ <div class="modal-content">
+
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+ <h4 class="modal-title" id="myModalLabel">Modal Heading</h4>
+ </div>
+ <div class="modal-body">
+ <h4>Text in a modal</h4>
+ <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem.</p>
+
+ <h4>Popover in a modal</h4>
+ <p>This <a href="#" role="button" class="btn popover-test" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">button</a> should trigger a popover on click.</p>
+
+ <h4>Tooltips in a modal</h4>
+ <p><a href="#" class="tooltip-test" title="Tooltip">This link</a> and <a href="#" class="tooltip-test" title="Tooltip">that link</a> should have tooltips on hover.</p>
+
+ <hr>
+
+ <h4>Overflowing text to show optional scrollbar</h4>
+ <p>We set a fixed <code>max-height</code> on the <code>.modal-body</code>. Watch it overflow with all this extra lorem ipsum text we've included.</p>
+ <p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
+ <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.</p>
+ <p>Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.</p>
+ <p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
+ <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.</p>
+ <p>Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.</p>
+ </div>
+ <div class="modal-footer">
+ <button class="btn" data-dismiss="modal">Close</button>
+ <button class="btn btn-primary">Save changes</button>
+ </div>
+
+ </div><!-- /.modal-content -->
+ </div><!-- /.modal-dalog -->
+ </div><!-- /.modal -->
+
<div class="bs-docs-example" style="padding-bottom: 24px;">
<a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">Launch demo modal</a>
</div>