diff options
| author | Mark Otto <[email protected]> | 2012-11-04 12:42:00 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-04 12:42:00 -0800 |
| commit | 1af0021014a1c50ac02facd23a36dfc8f74cd143 (patch) | |
| tree | ef31a032f6561d4d0276dac48f77c4e2c6eb448b /less | |
| parent | 508cc1fef4e11b2f985bff5bd663449676d10b0e (diff) | |
| parent | 22d1506d2325f432dfd35c8380b06f19b8f74441 (diff) | |
| download | bootstrap-1af0021014a1c50ac02facd23a36dfc8f74cd143.tar.xz bootstrap-1af0021014a1c50ac02facd23a36dfc8f74cd143.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
less/type.less
Diffstat (limited to 'less')
| -rw-r--r-- | less/type.less | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/less/type.less b/less/type.less index eded998fb..ec1c40ed7 100644 --- a/less/type.less +++ b/less/type.less @@ -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 |