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/upgrading.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/upgrading.html')
| -rw-r--r-- | docs/upgrading.html | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/docs/upgrading.html b/docs/upgrading.html index 47cac06dc..5416b9987 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -246,8 +246,19 @@ <h1>Javascript plugins</h1> </div> <div class="alert alert-info"> - <strong>Heads up!</strong> 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. + <strong>Heads up!</strong> We've rewritten just about everything for our plugins, so head on over to <a href="./javascript.html">the Javascript page</a> to learn more. </div> + <h3>Tooltips</h3> + <ul> + <li>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>.</li> + <li>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>.</li> + <li>The <code>animate</code> option was renamed to <code>animation</code>.</li> + <li>The <code>html</code> option was removed, as the tooltips default to allowing HTML now.</li> + </ul> + <h3>Tooltips</h3> + <ul> + <li>Values for <code>placement</code> option changed from <code>above</code> and <code>below</code> to <code>top</code> and <code>bottom</code>. (Affects popovers, too.)</li> + </ul> <h3>Popovers</h3> <ul> <li>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>.</li> |