2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

Merge branch '2.1.2-list-inline' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-list-inline

This commit is contained in:
Mark Otto
2012-11-04 12:27:30 -08:00
4 changed files with 76 additions and 0 deletions
+15
View File
@@ -111,6 +111,21 @@ ol.unstyled {
margin-left: 0;
list-style: none;
}
ul.inline,
ol.inline {
.clearfix();
}
ul.inline > li,
ol.inline > li {
float: left;
margin-right: 14px;
margin-left: 12px;
}
// Reset left padding for unstyled
ul.unstyled.inline > li,
ol.unstyled.inline > li {
padding-left: 0;
}
// Description Lists
dl {