diff options
| author | Mark Otto <[email protected]> | 2012-11-04 12:27:30 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-04 12:27:30 -0800 |
| commit | 68f26d959f97c761206bf5f6f808e6199d620ca2 (patch) | |
| tree | 506883677bb42f6fbda60540ec82a9d7f68b8fdb /docs/assets | |
| parent | e4866c4b3c50c1d1bef5c639c13a2210416b0157 (diff) | |
| parent | 233e050adfc171685fd2c2f6ad760a8556aa0eb2 (diff) | |
| download | bootstrap-68f26d959f97c761206bf5f6f808e6199d620ca2.tar.xz bootstrap-68f26d959f97c761206bf5f6f808e6199d620ca2.zip | |
Merge branch '2.1.2-list-inline' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-list-inline
Diffstat (limited to 'docs/assets')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b921274a0..35cfe8240 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -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; } |