diff options
| author | Mark Otto <[email protected]> | 2012-10-01 23:41:00 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-10-01 23:41:00 -0700 |
| commit | 4ab7b77aa3750ffb64bfc544850c2722053ebbda (patch) | |
| tree | d5a71ca6a28de913596766c8df97d3ec2c92d353 /docs/javascript.html | |
| parent | e6d6c7a413d69afc41c3c57b72f1b0dedfdbb516 (diff) | |
| parent | 7c9597f4e76d45571fab7a0e19d90b2fea8aab02 (diff) | |
| download | bootstrap-4ab7b77aa3750ffb64bfc544850c2722053ebbda.tar.xz bootstrap-4ab7b77aa3750ffb64bfc544850c2722053ebbda.zip | |
Merge branch '2.1.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/labels-badges.less
less/navbar.less
less/tables.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 241ea9cd0..f62a1ac7b 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -222,7 +222,7 @@ $('#myModal').on('show', function (e) { <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 hover.</p> + <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> |