mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts: docs/assets/bootstrap.zip
This commit is contained in:
commit
ccf7697185
Binary file not shown.
@ -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
2
docs/templates/pages/javascript.mustache
vendored
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user