Skip to content
GitLab
Explore
Projects
Groups
Snippets
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
28da3121
Commit
28da3121
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Refine new inline list option
parent
68f26d95
5 merge requests
!6060
Waits to tigger the hidden event
,
!6055
Typeahead complex source
,
!6061
Sorry, close this. I pulled to the wrong branch!
,
!5972
Dropdowfocus
,
!5974
Dropdownchanges
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/assets/css/bootstrap.css
+4
-23
docs/assets/css/bootstrap.css
docs/base-css.html
+6
-6
docs/base-css.html
docs/templates/pages/base-css.mustache
+6
-6
docs/templates/pages/base-css.mustache
less/type.less
+10
-12
less/type.less
with
26 additions
and
47 deletions
+26
-47
docs/assets/css/bootstrap.css
+
4
-
23
View file @
28da3121
...
...
@@ -816,33 +816,14 @@ ol.unstyled {
ul
.inline
,
ol
.inline
{
*
zoom
:
1
;
}
ul
.inline
:before
,
ol
.inline
:before
,
ul
.inline
:after
,
ol
.inline
:after
{
display
:
table
;
line-height
:
0
;
content
:
""
;
}
ul
.inline
:after
,
ol
.inline
:after
{
clear
:
both
;
list-style
:
none
;
}
ul
.inline
>
li
,
ol
.inline
>
li
{
float
:
left
;
margin-right
:
14px
;
margin-left
:
12px
;
}
ul
.unstyled.inline
>
li
,
ol
.unstyled.inline
>
li
{
padding-left
:
0
;
display
:
inline-block
;
padding-right
:
5px
;
padding-left
:
5px
;
}
dl
{
...
...
This diff is collapsed.
Click to expand it.
docs/base-css.html
+
6
-
6
View file @
28da3121
...
...
@@ -377,16 +377,16 @@
</pre>
<h3>
Inline
</h3>
<p>
A list of floated left items. Can be combined with with
<code>
.unstyled
</code>
</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"
>
<ul
class=
"
unstyled
inline"
>
<li>
<span
class=
"label label-important"
>
</span>
Stop signal
</li>
<li>
<span
class=
"label label-warning"
>
</span>
Prepare for signal
</li>
<li>
<span
class=
"label label-success"
>
</span>
Go!
</li>
<ul
class=
"inline"
>
<li>
Lorem ipsum
</li>
<li>
Phasellus iaculis
</li>
<li>
Nulla volutpat
</li>
</ul>
</div>
<pre
class=
"prettyprint linenums"
>
<
ul class="
unstyled
inline"
>
<
ul class="inline"
>
<
li
>
...
<
/li
>
<
/ul
>
</pre>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/base-css.mustache
+
6
-
6
View file @
28da3121
...
...
@@ -314,16 +314,16 @@
</pre>
<h3>
{{
_i
}}
Inline
{{/
i
}}
</h3>
<p>
{{
_i
}}
A list of floated left items. Can be combined with with
<code>
.unstyled
</code>
{{/
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"
>
<ul
class=
"
unstyled
inline"
>
<li>
<span
class=
"label label-important"
>
</span>
Stop signal
</li>
<li>
<span
class=
"label label-warning"
>
</span>
Prepare for signal
</li>
<li>
<span
class=
"label label-success"
>
</span>
Go!
</li>
<ul
class=
"inline"
>
<li>
Lorem ipsum
</li>
<li>
Phasellus iaculis
</li>
<li>
Nulla volutpat
</li>
</ul>
</div>
<pre
class=
"prettyprint linenums"
>
<
ul class="
unstyled
inline"
>
<
ul class="inline"
>
<
li
>
...
<
/li
>
<
/ul
>
</pre>
...
...
This diff is collapsed.
Click to expand it.
less/type.less
+
10
-
12
View file @
28da3121
...
...
@@ -106,25 +106,23 @@ ol ul {
li {
line-height: @baseLineHeight;
}
// Remove default list styles
ul.unstyled,
ol.unstyled {
margin-left: 0;
list-style: none;
}
// Single-line list items
ul.inline,
ol.inline {
.clearfix();
}
ul.inline > li,
ol.inline > li {
float: left;
margin-right: 14px;
margin-left: 12px;
}
// Reset left padding for unstyled
ul.unstyled.inline > li,
ol.unstyled.inline > li {
padding-left: 0;
list-style: none;
& > li {
display: inline-block;
padding-left: 5px;
padding-right: 5px;
}
}
// Description Lists
...
...
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
Menu
Explore
Projects
Groups
Snippets