1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-14 01:24:19 +02:00

Merge branch 'list-inline-padding' into v4-dev

This commit is contained in:
Mark Otto
2015-12-06 16:29:35 -08:00
2 changed files with 5 additions and 3 deletions

View File

@@ -92,12 +92,12 @@ mark,
// Inline turns list items into inline-block // Inline turns list items into inline-block
.list-inline { .list-inline {
@include list-unstyled; @include list-unstyled;
margin-left: -5px; margin-left: -$list-inline-padding;
> li { > li {
display: inline-block; display: inline-block;
padding-right: 5px; padding-right: $list-inline-padding;
padding-left: 5px; padding-left: $list-inline-padding;
} }
} }

View File

@@ -180,6 +180,8 @@ $dt-font-weight: bold !default;
$nested-kbd-font-weight: bold !default; $nested-kbd-font-weight: bold !default;
$list-inline-padding: 5px !default;
// Components // Components
// //