Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
508cc1fe
Commit
508cc1fe
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
change up list classes to use .list- prefix
parent
269be76f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/assets/css/bootstrap.css
+3
-6
docs/assets/css/bootstrap.css
docs/base-css.html
+4
-4
docs/base-css.html
docs/templates/pages/base-css.mustache
+4
-4
docs/templates/pages/base-css.mustache
less/type.less
+2
-4
less/type.less
with
13 additions
and
18 deletions
+13
-18
docs/assets/css/bootstrap.css
+
3
-
6
View file @
508cc1fe
...
@@ -544,19 +544,16 @@ li {
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
docs/base-css.html
+
4
-
4
View file @
508cc1fe
...
@@ -349,7 +349,7 @@
...
@@ -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 @@
...
@@ -368,7 +368,7 @@
</ul>
</ul>
</div>
</div>
<pre
class=
"prettyprint linenums"
>
<pre
class=
"prettyprint linenums"
>
<
ul class="unstyled"
>
<
ul class="
list-
unstyled"
>
<
li
>
...
<
/li
>
<
li
>
...
<
/li
>
<
/ul
>
<
/ul
>
</pre>
</pre>
...
@@ -376,14 +376,14 @@
...
@@ -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"
>
<
ul class="inline"
>
<
ul class="
list-
inline"
>
<
li
>
...
<
/li
>
<
li
>
...
<
/li
>
<
/ul
>
<
/ul
>
</pre>
</pre>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/base-css.mustache
+
4
-
4
View file @
508cc1fe
...
@@ -289,7 +289,7 @@
...
@@ -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 @@
...
@@ -308,7 +308,7 @@
</ul>
</ul>
</div>
</div>
<pre
class=
"prettyprint linenums"
>
<pre
class=
"prettyprint linenums"
>
<
ul class="unstyled"
>
<
ul class="
list-
unstyled"
>
<
li
>
...
<
/li
>
<
li
>
...
<
/li
>
<
/ul
>
<
/ul
>
</pre>
</pre>
...
@@ -316,14 +316,14 @@
...
@@ -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"
>
<
ul class="inline"
>
<
ul class="
list-
inline"
>
<
li
>
...
<
/li
>
<
li
>
...
<
/li
>
<
/ul
>
<
/ul
>
</pre>
</pre>
...
...
This diff is collapsed.
Click to expand it.
less/type.less
+
2
-
4
View file @
508cc1fe
...
@@ -107,15 +107,13 @@ li {
...
@@ -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;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment