Hopiu/bootstrap
1
0
Fork 0
mirror of https://github.com/Hopiu/bootstrap.git synced 2026-04-05 05:40:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip

Browse source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto 2012-02-26 23:15:36 -08:00
commit ccf7697185
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View file

Binary file not shown.

2
docs/javascript.html
View file

@ -276,7 +276,7 @@
<td>backdrop</td>
<td>boolean</td>
<td>true</td>
<td>Includes a modal-backdrop element</td>
<td>Includes a modal-backdrop element. Alternatively, specify <code>static</code> for a backdrop which doesn't close the modal on click.</td>
</tr>
<tr>
<td>keyboard</td>

2
docs/templates/pages/javascript.mustache vendored
View file

@ -200,7 +200,7 @@
<td>{{_i}}backdrop{{/i}}</td>
<td>{{_i}}boolean{{/i}}</td>
<td>{{_i}}true{{/i}}</td>
<td>{{_i}}Includes a modal-backdrop element{{/i}}</td>
<td>{{_i}}Includes a modal-backdrop element. Alternatively, specify <code>static</code> for a backdrop which doesn't close the modal on click.{{/i}}</td>
</tr>
<tr>
<td>{{_i}}keyboard{{/i}}</td>