github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Otto
2012-11-04 12:27:30 -08:00
parent e4866c4b3c 233e050adf
commit 68f26d959f
4 changed files with 76 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
docs/assets/css/bootstrap.css vendored
View File

@@ -814,6 +814,37 @@ ol.unstyled {
list-style: none;
}
ul.inline,
ol.inline {
*zoom: 1;
}
ul.inline:before,
ol.inline:before,
ul.inline:after,
ol.inline:after {
display: table;
line-height: 0;
content: "";
}
ul.inline:after,
ol.inline:after {
clear: both;
}
ul.inline > li,
ol.inline > li {
float: left;
margin-right: 14px;
margin-left: 12px;
}
ul.unstyled.inline > li,
ol.unstyled.inline > li {
padding-left: 0;
}
dl {
margin-bottom: 20px;
}