diff options
| author | Mark Otto <[email protected]> | 2012-09-17 23:03:18 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-17 23:03:32 -0700 |
| commit | cedb3c7c56887d4ca42296ee193f2ff08dfe9ac4 (patch) | |
| tree | ef9e28545e2dfb529daa030fb2a30d9a4b1b4d02 /docs | |
| parent | 783f4885ab984acecfcb2a2986158aaa8933ea2d (diff) | |
| download | bootstrap-cedb3c7c56887d4ca42296ee193f2ff08dfe9ac4.tar.xz bootstrap-cedb3c7c56887d4ca42296ee193f2ff08dfe9ac4.zip | |
fixes #5173: proper popover offsets; added docs examples to enable tests in the future
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 4 | ||||
| -rw-r--r-- | docs/javascript.html | 10 | ||||
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 10 |
3 files changed, 22 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 201d1f842..0538e4b01 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5109,7 +5109,7 @@ input[type="submit"].btn.btn-mini { } .popover.top { - margin-bottom: 10px; + margin-top: -10px; } .popover.right { @@ -5121,7 +5121,7 @@ input[type="submit"].btn.btn-mini { } .popover.left { - margin-right: 10px; + margin-left: -10px; } .popover-title { diff --git a/docs/javascript.html b/docs/javascript.html index a0c707b8d..6c028e01e 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -925,6 +925,16 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <a href="#" class="btn btn-large btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">Click to toggle popover</a> </div> + <h4>Four directions</h4> + <div class="bs-docs-example tooltip-demo"> + <ul class="bs-docs-tooltip-examples"> + <li><a href="#" class="btn" rel="popover" data-placement="top" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on top">Popover on top</a></li> + <li><a href="#" class="btn" rel="popover" data-placement="right" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on right">Popover on right</a></li> + <li><a href="#" class="btn" rel="popover" data-placement="bottom" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on bottom">Popover on bottom</a></li> + <li><a href="#" class="btn" rel="popover" data-placement="left" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on left">Popover on left</a></li> + </ul> + </div> + <hr class="bs-docs-separator"> diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 2cdb172db..b707ebe20 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -855,6 +855,16 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <a href="#" class="btn btn-large btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">{{_i}}Click to toggle popover{{/i}}</a> </div> + <h4>{{_i}}Four directions{{/i}}</h4> + <div class="bs-docs-example tooltip-demo"> + <ul class="bs-docs-tooltip-examples"> + <li><a href="#" class="btn" rel="popover" data-placement="top" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on top">Popover on top</a></li> + <li><a href="#" class="btn" rel="popover" data-placement="right" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on right">Popover on right</a></li> + <li><a href="#" class="btn" rel="popover" data-placement="bottom" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on bottom">Popover on bottom</a></li> + <li><a href="#" class="btn" rel="popover" data-placement="left" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." title="Popover on left">Popover on left</a></li> + </ul> + </div>{{! /example }} + <hr class="bs-docs-separator"> |