rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'barsoom-ol-unstyled' into 2.0.1-wip

Browse Source
This commit is contained in:
Mark Otto 2012-02-09 23:20:05 -08:00
commit c10661cf5d
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/assets/css/bootstrap.css vendored
View File

@ -374,7 +374,8 @@ ol {
li {
line-height: 18px;
}
ul.unstyled {
ul.unstyled,
ol.unstyled {
margin-left: 0;
list-style: none;
}

7
docs/templates/pages/upgrading.mustache vendored
View File

@ -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>

3
less/type.less
View File

@ -110,7 +110,8 @@ ol {
li {
line-height: @baseLineHeight;
}
ul.unstyled {
ul.unstyled,
ol.unstyled {
margin-left: 0;
list-style: none;
}