kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

Merge branch '2.2.2-wip' into exploratory

Browse source 
Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
This commit is contained in:
Mark Otto 2012-11-04 12:42:00 -08:00
commit 1af0021014
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/assets/css/bootstrap.css vendored
View file

@ -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;
} }

19
less/type.less
View file

@ -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