Merge branch '2.2.2-wip' into exploratory

This commit is contained in:
Mark Otto
2012-11-04 12:37:44 -08:00
4 changed files with 57 additions and 2 deletions

View File

@@ -105,12 +105,25 @@ 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 {
list-style: none;
& > li {
display: inline-block;
padding-left: 5px;
padding-right: 5px;
}
}
// Description Lists
dl {
margin-bottom: @baseLineHeight;