Skip to content
GitLab
Commit 1af00210 authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch '2.2.2-wip' into exploratory 

Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
parents 508cc1fe 22d1506d
Hide whitespace changes
Inline Side-by-side
Showing
with 11 additions and 15 deletions
+11 -15
docs/assets/css/bootstrap.css
+ 2
- 5
View file @ 1af00210
...@@ -544,12 +544,9 @@ li { ...@@ -544,12 +544,9 @@ li {
line-height: 20px; line-height: 20px;
} }
.list-unstyled { .list-unstyled,
margin-left: 0;
list-style: none;
}
.list-inline { .list-inline {
margin-left: 0;
list-style: none; list-style: none;
} }
......
less/type.less
+ 9
- 10
View file @ 1af00210
...@@ -106,20 +106,19 @@ li { ...@@ -106,20 +106,19 @@ li {
line-height: @baseLineHeight; line-height: @baseLineHeight;
} }
// Remove default list styles // List options
.list-unstyled { // Unstyled keeps list items block level, just removes list-style
.list-unstyled,
// Inline turns list items into inline-block
.list-inline {
margin-left: 0; margin-left: 0;
list-style: none; list-style: none;
} }
// Single-line list items // Single-line list items
.list-inline { .list-inline > li {
list-style: none; display: inline-block;
& > li { padding-left: 5px;
display: inline-block; padding-right: 5px;
padding-left: 5px;
padding-right: 5px;
}
} }
// Description Lists // Description Lists
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment