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

change up list classes to use .list- prefix

Browse Source
This commit is contained in:
Mark Otto 2012-11-04 12:38:35 -08:00
parent 269be76f4a
commit 508cc1fef4
4 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -544,19 +544,16 @@ li {
line-height: 20px; line-height: 20px;
} }
ul.unstyled, .list-unstyled {
ol.unstyled {
margin-left: 0; margin-left: 0;
list-style: none; list-style: none;
} }
ul.inline, .list-inline {
ol.inline {
list-style: none; list-style: none;
} }
ul.inline > li, .list-inline > li {
ol.inline > li {
display: inline-block; display: inline-block;
padding-right: 5px; padding-right: 5px;
padding-left: 5px; padding-left: 5px;

8
docs/base-css.html
View File

@ -349,7 +349,7 @@
<h3>Unstyled</h3> <h3>Unstyled</h3>
<p>Remove default the <code>list-style</code> and left padding on list items (immediate children only).</p> <p>Remove default the <code>list-style</code> and left padding on list items (immediate children only).</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<ul class="unstyled"> <ul class="list-unstyled">
<li>Lorem ipsum dolor sit amet</li> <li>Lorem ipsum dolor sit amet</li>
<li>Consectetur adipiscing elit</li> <li>Consectetur adipiscing elit</li>
<li>Integer molestie lorem at massa</li> <li>Integer molestie lorem at massa</li>
@ -368,7 +368,7 @@
</ul> </ul>
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;ul class="unstyled"&gt; &lt;ul class="list-unstyled"&gt;
&lt;li&gt;...&lt;/li&gt; &lt;li&gt;...&lt;/li&gt;
&lt;/ul&gt; &lt;/ul&gt;
</pre> </pre>
@ -376,14 +376,14 @@
<h3>Inline</h3> <h3>Inline</h3>
<p>Place all list items on a single line with <code>inline-block</code> and some light padding.</p> <p>Place all list items on a single line with <code>inline-block</code> and some light padding.</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<ul class="inline"> <ul class="list-inline">
<li>Lorem ipsum</li> <li>Lorem ipsum</li>
<li>Phasellus iaculis</li> <li>Phasellus iaculis</li>
<li>Nulla volutpat</li> <li>Nulla volutpat</li>
</ul> </ul>
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;ul class="inline"&gt; &lt;ul class="list-inline"&gt;
&lt;li&gt;...&lt;/li&gt; &lt;li&gt;...&lt;/li&gt;
&lt;/ul&gt; &lt;/ul&gt;
</pre> </pre>

8
docs/templates/pages/base-css.mustache vendored
View File

@ -289,7 +289,7 @@
<h3>{{_i}}Unstyled{{/i}}</h3> <h3>{{_i}}Unstyled{{/i}}</h3>
<p>{{_i}}Remove default the <code>list-style</code> and left padding on list items (immediate children only).{{/i}}</p> <p>{{_i}}Remove default the <code>list-style</code> and left padding on list items (immediate children only).{{/i}}</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<ul class="unstyled"> <ul class="list-unstyled">
<li>Lorem ipsum dolor sit amet</li> <li>Lorem ipsum dolor sit amet</li>
<li>Consectetur adipiscing elit</li> <li>Consectetur adipiscing elit</li>
<li>Integer molestie lorem at massa</li> <li>Integer molestie lorem at massa</li>
@ -308,7 +308,7 @@
</ul> </ul>
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;ul class="unstyled"&gt; &lt;ul class="list-unstyled"&gt;
&lt;li&gt;...&lt;/li&gt; &lt;li&gt;...&lt;/li&gt;
&lt;/ul&gt; &lt;/ul&gt;
</pre> </pre>
@ -316,14 +316,14 @@
<h3>{{_i}}Inline{{/i}}</h3> <h3>{{_i}}Inline{{/i}}</h3>
<p>{{_i}}Place all list items on a single line with <code>inline-block</code> and some light padding.{{/i}}</p> <p>{{_i}}Place all list items on a single line with <code>inline-block</code> and some light padding.{{/i}}</p>
<div class="bs-docs-example"> <div class="bs-docs-example">
<ul class="inline"> <ul class="list-inline">
<li>Lorem ipsum</li> <li>Lorem ipsum</li>
<li>Phasellus iaculis</li> <li>Phasellus iaculis</li>
<li>Nulla volutpat</li> <li>Nulla volutpat</li>
</ul> </ul>
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;ul class="inline"&gt; &lt;ul class="list-inline"&gt;
&lt;li&gt;...&lt;/li&gt; &lt;li&gt;...&lt;/li&gt;
&lt;/ul&gt; &lt;/ul&gt;
</pre> </pre>

6
less/type.less
View File

@ -107,15 +107,13 @@ li {
} }
// Remove default list styles // Remove default list styles
ul.unstyled, .list-unstyled {
ol.unstyled {
margin-left: 0; margin-left: 0;
list-style: none; list-style: none;
} }
// Single-line list items // Single-line list items
ul.inline, .list-inline {
ol.inline {
list-style: none; list-style: none;
& > li { & > li {
display: inline-block; display: inline-block;