diff options
| author | Mark Otto <[email protected]> | 2015-12-07 23:31:02 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-12-07 23:31:02 -0800 |
| commit | 515ff1aacb6f4581f3fe4193040f6ce36a2967fa (patch) | |
| tree | d1907eb16a2371e409d4ec569889ee9308d9ff47 | |
| parent | d3c87d32fad1ce71b78c1f7ec3ac5369c52f7072 (diff) | |
| download | bootstrap-515ff1aacb6f4581f3fe4193040f6ce36a2967fa.tar.xz bootstrap-515ff1aacb6f4581f3fe4193040f6ce36a2967fa.zip | |
rewrite list-inline to use margin and simpler styles
| -rw-r--r-- | docs/content/typography.md | 2 | ||||
| -rw-r--r-- | scss/_type.scss | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/content/typography.md b/docs/content/typography.md index d8cd4b010..846852a95 100644 --- a/docs/content/typography.md +++ b/docs/content/typography.md @@ -205,7 +205,7 @@ Remove the default `list-style` and left margin on list items (immediate childre ### Inline -Place all list items on a single line with `display: inline-block;` and some light padding. +Place all list items on a single line with `display: inline-block;` and some basic margin between. {% example html %} <ul class="list-inline"> diff --git a/scss/_type.scss b/scss/_type.scss index ea682812e..35780d39e 100644 --- a/scss/_type.scss +++ b/scss/_type.scss @@ -92,13 +92,13 @@ mark, // Inline turns list items into inline-block .list-inline { @include list-unstyled; - margin-left: -$list-inline-padding; } - .list-inline-item { display: inline-block; - padding-right: $list-inline-padding; - padding-left: $list-inline-padding; + + &:not(:last-child) { + margin-right: $list-inline-padding; + } } // Horizontal description lists w/ grid classes |