mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-26 05:19:15 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.1.2-wip' into exploratory

Browse Source 
Conflicts:
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
This commit is contained in:
Mark Otto
2012-09-30 22:45:39 -07:00
parent ad96435d27 da43c7c27c
commit bbd543db53
14 changed files with 437 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/javascript.html
View File

@@ -247,10 +247,10 @@ $('#myModal').on('show', function (e) {
<a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">Launch demo modal</a>
</div>
<pre class="prettyprint linenums">
&lt;-- Button to trigger modal --&gt;
&lt!-- Button to trigger modal --&gt;
&lt;a href="#myModal" role="button" class="btn" data-toggle="modal"&gt;Launch demo modal&lt;/a&gt;
&lt;-- Modal --&gt;
&lt!-- Modal --&gt;
&lt;div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"&gt;
&lt;div class="modal-header"&gt;
&lt;button type="button" class="close" data-dismiss="modal" aria-hidden="true"&gt;&times;&lt;/button&gt;