diff options
| author | Chris Rebert <[email protected]> | 2014-07-28 13:51:51 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-07-28 13:51:51 -0700 |
| commit | 29731035716783087d6b96f67f519967fae46a2a (patch) | |
| tree | 8a0790dfbcebaa1b5a8ac45183f3736ad8229bf8 /docs/_includes | |
| parent | 5892273a2367ccc0b599414e848ccabd74781403 (diff) | |
| parent | 90424296eb339a579fc47eec18029af299e38b28 (diff) | |
| download | bootstrap-29731035716783087d6b96f67f519967fae46a2a.tar.xz bootstrap-29731035716783087d6b96f67f519967fae46a2a.zip | |
Merge pull request #14257 from twbs/fix-14219
Document that empty tooltips+popovers do not get displayed
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/js/popovers.html | 1 | ||||
| -rw-r--r-- | docs/_includes/js/tooltips.html | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html index 4ab7253b1..ab3d9fea0 100644 --- a/docs/_includes/js/popovers.html +++ b/docs/_includes/js/popovers.html @@ -3,6 +3,7 @@ <h2 id="popovers-examples">Examples</h2> <p>Add small overlays of content, like those on the iPad, to any element for housing secondary information.</p> + <p>Popovers whose both title and content are zero-length are never displayed.</p> <div class="bs-callout bs-callout-danger"> <h4>Plugin dependency</h4> diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html index 33743c4c2..80e0ce714 100644 --- a/docs/_includes/js/tooltips.html +++ b/docs/_includes/js/tooltips.html @@ -1,8 +1,9 @@ <div class="bs-docs-section"> <h1 id="tooltips" class="page-header">Tooltips <small>tooltip.js</small></h1> + <p>Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, use CSS3 for animations, and data-attributes for local title storage.</p> + <p>Tooltips with zero-length titles are never displayed.</p> <h2 id="tooltips-examples">Examples</h2> - <p>Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, use CSS3 for animations, and data-attributes for local title storage.</p> <p>Hover over the links below to see tooltips:</p> <div class="bs-example tooltip-demo"> <p class="muted" style="margin-bottom: 0;">Tight pants next level keffiyeh <a href="#" data-toggle="tooltip" title="Default tooltip">you probably</a> haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel <a href="#" data-toggle="tooltip" title="Another tooltip">have a</a> terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan <a href="#" data-toggle="tooltip" title="Another one here too">whatever keytar</a>, scenester farm-to-table banksy Austin <a href="#" data-toggle="tooltip" title="The last tip!">twitter handle</a> freegan cred raw denim single-origin coffee viral. |