diff options
| author | Mark Otto <[email protected]> | 2015-12-06 16:29:35 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-12-06 16:29:35 -0800 |
| commit | 239befe16b478d9709d97289ada132a4d218ba7b (patch) | |
| tree | cb519a95edb6a8cc1c4f2716141fdec57b5b6629 | |
| parent | 873a9409a382ba5c0c07a7f7b18b92c0bd282973 (diff) | |
| parent | e8dcb2f9178c61485ba54448a93e2393223c3d6a (diff) | |
| download | bootstrap-239befe16b478d9709d97289ada132a4d218ba7b.tar.xz bootstrap-239befe16b478d9709d97289ada132a4d218ba7b.zip | |
Merge branch 'list-inline-padding' into v4-dev
| -rw-r--r-- | scss/_type.scss | 6 | ||||
| -rw-r--r-- | scss/_variables.scss | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/scss/_type.scss b/scss/_type.scss index 23ed54040..6759677aa 100644 --- a/scss/_type.scss +++ b/scss/_type.scss @@ -92,12 +92,12 @@ mark, // Inline turns list items into inline-block .list-inline { @include list-unstyled; - margin-left: -5px; + margin-left: -$list-inline-padding; > li { display: inline-block; - padding-right: 5px; - padding-left: 5px; + padding-right: $list-inline-padding; + padding-left: $list-inline-padding; } } diff --git a/scss/_variables.scss b/scss/_variables.scss index 9400d1bd6..57f2404b8 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -180,6 +180,8 @@ $dt-font-weight: bold !default; $nested-kbd-font-weight: bold !default; +$list-inline-padding: 5px !default; + // Components // |