diff options
| author | Jacob Thornton <[email protected]> | 2012-02-12 11:07:34 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-02-12 11:07:34 -0800 |
| commit | d7953a8f1e491d6ec5e479e26d15ae3b545fbb5f (patch) | |
| tree | 8bc5e771a8b3dad44e16aedb7ac1827ca368d952 /docs/javascript.html | |
| parent | ed07a4d0ce0e769ef6efbd8d465670b26a0a5e37 (diff) | |
| parent | 2eedf60d6284f8eef256999d2a59dd18bcbd2b2a (diff) | |
| download | bootstrap-d7953a8f1e491d6ec5e479e26d15ae3b545fbb5f.tar.xz bootstrap-d7953a8f1e491d6ec5e479e26d15ae3b545fbb5f.zip | |
Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 861c18c1a..c30282f28 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -134,7 +134,7 @@ <div class="span3"> <label> <h3><a href="./javascript.html#tooltips">Tooltips</a></h3> - <p>A new take on the jQuery Tipsy plugin, Tooltips don't rely on images, use CSS3 for animations, and data-attributes for local title storage.</p> + <p>A new take on the jQuery Tipsy plugin, Tooltips don't rely on images—they use CSS3 for animations and data-attributes for local title storage.</p> </label> </div> <div class="span3"> @@ -700,14 +700,14 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <div class="row"> <div class="span3 columns"> <h3>About Tooltips</h3> - <p>Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; Tooltips are an updated version, which don't rely on images, uss css3 for animations, and data-attributes for local title storage.</p> + <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> <a href="assets/js/bootstrap-tooltip.js" target="_blank" class="btn">Download file</a> </div> <div class="span9 columns"> <h2>Example use of Tooltips</h2> <p>Hover over the links below to see tooltips:</p> <div class="tooltip-demo well"> - <p class="muted" style="margin-bottom: 0;">Tight pants next level keffiyeh <a href="#" rel='tooltip' title="first 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="#" rel='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 <a href="#" rel='tooltip' title='Another one here too'>really ironic</a> artisan whatever keytar, scenester farm-to-table banksy Austin <a href="#" rel='tooltip' title='The last tip!'>twitter handle</a> freegan cred raw denim single-origin coffee viral. + <p class="muted" style="margin-bottom: 0;">Tight pants next level keffiyeh <a href="#" rel="tooltip" title="first 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="#" rel="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 <a href="#" rel="tooltip" title="Another one here too">really ironic</a> artisan whatever keytar, scenester farm-to-table banksy Austin <a href="#" rel="tooltip" title="The last tip!">twitter handle</a> freegan cred raw denim single-origin coffee viral. </p> </div> <hr> |