diff options
| author | Mark Otto <[email protected]> | 2013-03-27 15:42:11 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-03-27 15:42:11 -0700 |
| commit | f0f33eb9a3a25ae2f0032f630ff84c58cb0ca431 (patch) | |
| tree | 7b65cd5896a8cef3130dc34330c6bd223fa00781 | |
| parent | 5b298a2aaf5286564b1dc614bb439eb19edf2c25 (diff) | |
| download | bootstrap-f0f33eb9a3a25ae2f0032f630ff84c58cb0ca431.tar.xz bootstrap-f0f33eb9a3a25ae2f0032f630ff84c58cb0ca431.zip | |
Refactor .list-inline and .list-unstyled
* Instead of shared and separate CSS, isolate by class for easier mixin-ability
* .list-unstyled is now used as a mixin in .list-inline
| -rw-r--r-- | docs/assets/css/bootstrap.css | 6 | ||||
| -rw-r--r-- | less/type.less | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5632d3aad..50d207001 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -546,7 +546,11 @@ li { line-height: 20px; } -.list-unstyled, +.list-unstyled { + margin-left: 0; + list-style: none; +} + .list-inline { margin-left: 0; list-style: none; diff --git a/less/type.less b/less/type.less index 193078c72..60ad793e9 100644 --- a/less/type.less +++ b/less/type.less @@ -126,18 +126,20 @@ li { } // List options + // Unstyled keeps list items block level, just removes list-style -.list-unstyled, -// Inline turns list items into inline-block -.list-inline { +.list-unstyled { margin-left: 0; list-style: none; } -// Single-line list items -.list-inline > li { - display: inline-block; - padding-left: 5px; - padding-right: 5px; +// Inline turns list items into inline-block +.list-inline { + .list-unstyled(); + > li { + display: inline-block; + padding-left: 5px; + padding-right: 5px; + } } // Description Lists |