Skip to content

B
bootstrap
Commit 1af00210 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch '2.2.2-wip' into exploratory 

Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
parents 508cc1fe 22d1506d
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 15 deletions
docs/assets/css/bootstrap.css
View file @ 1af00210
......@@ -544,12 +544,9 @@ li {
line-height: 20px;
}
.list-unstyled {
margin-left: 0;
list-style: none;
}
.list-unstyled,
.list-inline {
margin-left: 0;
list-style: none;
}
......
less/type.less
View file @ 1af00210
......@@ -106,20 +106,19 @@ li {
line-height: @baseLineHeight;
}
// Remove default list styles
.list-unstyled {
// List options
// Unstyled keeps list items block level, just removes list-style
.list-unstyled,
// Inline turns list items into inline-block
.list-inline {
margin-left: 0;
list-style: none;
}
// Single-line list items
.list-inline {
list-style: none;
& > li {
.list-inline > li {
display: inline-block;
padding-left: 5px;
padding-right: 5px;
}
}
// Description Lists
......
Markdown is supported
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