rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages 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;
}
.list-unstyled {
margin-left: 0;
list-style: none;
}
.list-unstyled,
.list-inline {
margin-left: 0;
list-style: none;
}

19
less/type.less
View File

@ -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 {
display: inline-block;
padding-left: 5px;
padding-right: 5px;
}
.list-inline > li {
display: inline-block;
padding-left: 5px;
padding-right: 5px;
}
// Description Lists