Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <markotto@twitter.com>2012-02-10 11:20:05 +0400
committerMark Otto <markotto@twitter.com>2012-02-10 11:20:05 +0400
commitc10661cf5d5e84bf840c0f2404218c0bc08add27 (patch)
tree0852ceda3ebd208362eb19103017b2329a937496 /docs/templates/pages
parentb36a744fa74ace319b9f924f777df50591ceb62c (diff)
parent9126014e93d60a382c8f8fabb012fc9776915414 (diff)
Merge branch 'barsoom-ol-unstyled' into 2.0.1-wip
Diffstat (limited to 'docs/templates/pages')
-rw-r--r--docs/templates/pages/upgrading.mustache7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index 45ab0703bd..77e2e02cd9 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -172,6 +172,13 @@
<div class="alert alert-info">
<strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}We're rewritten just about everything for our plugins, so head on over to <a href="./javascript.html">the Javascript page</a> to learn more.{{/i}}
</div>
+ <h3>{{_i}}Tooltips{{/i}}</h3>
+ <ul>
+ <li>{{_i}}The plugin method has been renamed from <code>twipsy()</code> to <code>tooltip()</code>, and the class name changed from <code>twipsy</code> to <code>tooltip</code>.{{/i}}</li>
+ <li>{{_i}}The <code>placement</code> option value that was <code>below</code> is now <code>bottom</code>, and <code>above</code> is now <code>top</code>.{{/i}}</li>
+ <li>{{_i}}The <code>animate</code> option was renamed to <code>animation</code>.{{/i}}</li>
+ <li>{{_i}}The <code>html</code> option was removed, as the tooltips default to allowing HTML now.{{/i}}</li>
+ </ul>
<h3>{{_i}}Popovers{{/i}}</h3>
<ul>
<li>{{_i}}Child elements now properly namespaced: <code>.title</code> to <code>.popover-title</code>, <code>.inner</code> to <code>.popover-inner</code>, and <code>.content</code> to <code>.popover-content</code>.{{/i}}</li>