diff options
| author | Mark Otto <[email protected]> | 2014-12-31 10:39:56 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-12-31 10:39:56 -0800 |
| commit | 1a932b7e02ccb091a6e99e74039f3ea949ce459e (patch) | |
| tree | 66b7012e97657bc5ad5542e59ded8f0064eb36e3 /docs/_includes | |
| parent | a5e127fd168f33c087b645afb456c27c7da2bb6d (diff) | |
| parent | b9de4b739200537307112fdc59512a867a3f3774 (diff) | |
| download | bootstrap-1a932b7e02ccb091a6e99e74039f3ea949ce459e.tar.xz bootstrap-1a932b7e02ccb091a6e99e74039f3ea949ce459e.zip | |
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/js/popovers.html | 20 | ||||
| -rw-r--r-- | docs/_includes/js/tooltips.html | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html index ab33baccb..4557a44a4 100644 --- a/docs/_includes/js/popovers.html +++ b/docs/_includes/js/popovers.html @@ -39,24 +39,24 @@ $(function () { <h3>Static popover</h3> <p>Four options are available: top, right, bottom, and left aligned.</p> <div class="bs-example bs-example-popover"> - <div class="popover top"> - <div class="arrow"></div> + <div class="popover popover-top"> + <div class="popover-arrow"></div> <h3 class="popover-title">Popover top</h3> <div class="popover-content"> <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p> </div> </div> - <div class="popover right"> - <div class="arrow"></div> + <div class="popover popover-right"> + <div class="popover-arrow"></div> <h3 class="popover-title">Popover right</h3> <div class="popover-content"> <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p> </div> </div> - <div class="popover bottom"> - <div class="arrow"></div> + <div class="popover popover-bottom"> + <div class="popover-arrow"></div> <h3 class="popover-title">Popover bottom</h3> <div class="popover-content"> @@ -64,8 +64,8 @@ $(function () { </div> </div> - <div class="popover left"> - <div class="arrow"></div> + <div class="popover popover-left"> + <div class="popover-arrow"></div> <h3 class="popover-title">Popover left</h3> <div class="popover-content"> <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p> @@ -207,12 +207,12 @@ sagittis lacus vel augue laoreet rutrum faucibus."> <tr> <td>template</td> <td>string</td> - <td><code>'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'</code></td> + <td><code>'<div class="popover" role="tooltip"><div class="popover-arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'</code></td> <td> <p>Base HTML to use when creating the popover.</p> <p>The popover's <code>title</code> will be injected into the <code>.popover-title</code>.</p> <p>The popover's <code>content</code> will be injected into the <code>.popover-content</code>.</p> - <p><code>.arrow</code> will become the popover's arrow.</p> + <p><code>.popover-arrow</code> will become the popover's arrow.</p> <p>The outermost wrapper element should have the <code>.popover</code> class.</p> </td> </tr> diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html index ae553e0df..b8293c9f5 100644 --- a/docs/_includes/js/tooltips.html +++ b/docs/_includes/js/tooltips.html @@ -12,25 +12,25 @@ <h3>Static tooltip</h3> <p>Four options are available: top, right, bottom, and left aligned.</p> <div class="bs-example bs-example-tooltip"> - <div class="tooltip left" role="tooltip"> + <div class="tooltip tooltip-left" role="tooltip"> <div class="tooltip-arrow"></div> <div class="tooltip-inner"> Tooltip on the left </div> </div> - <div class="tooltip top" role="tooltip"> + <div class="tooltip tooltip-top" role="tooltip"> <div class="tooltip-arrow"></div> <div class="tooltip-inner"> Tooltip on the top </div> </div> - <div class="tooltip bottom" role="tooltip"> + <div class="tooltip tooltip-bottom" role="tooltip"> <div class="tooltip-arrow"></div> <div class="tooltip-inner"> Tooltip on the bottom </div> </div> - <div class="tooltip right" role="tooltip"> + <div class="tooltip tooltip-right" role="tooltip"> <div class="tooltip-arrow"></div> <div class="tooltip-inner"> Tooltip on the right |