diff options
| author | Mark Otto <[email protected]> | 2012-11-04 19:59:07 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-04 19:59:07 -0800 |
| commit | ee93541421e41f3a9589f9c945ef4a6614f48b4b (patch) | |
| tree | af6a1171e971cf054b6d5649d3378409abff9fbd /docs/javascript.html | |
| parent | 1af0021014a1c50ac02facd23a36dfc8f74cd143 (diff) | |
| parent | 62c78e46f8d027d0797c66bef5ce8cdb8d667ace (diff) | |
| download | bootstrap-ee93541421e41f3a9589f9c945ef4a6614f48b4b.tar.xz bootstrap-ee93541421e41f3a9589f9c945ef4a6614f48b4b.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
less/buttons.less
less/forms.less
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 445bda40d..516759cc1 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -178,7 +178,7 @@ $('#myModal').on('show', function (e) { <h3>Static example</h3> <p>A rendered modal with header, body, and set of actions in the footer.</p> <div class="bs-docs-example" style="background-color: #f5f5f5;"> - <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto 20px; z-index: 1; max-width: 100%;"> + <div class="modal" style="position: relative; top: auto; left: auto; right: auto; margin: 0 auto 20px; z-index: 1; max-width: 100%;"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h3>Modal header</h3> |