diff options
| author | Mark Otto <markdotto@gmail.com> | 2017-10-23 05:59:20 +0300 |
|---|---|---|
| committer | Mark Otto <markdotto@gmail.com> | 2017-10-23 05:59:20 +0300 |
| commit | 04b32db845df33c9daa6855a9fd44f38964a65a4 (patch) | |
| tree | 0ac1f72088378bc5513b0e6aefbbc3e5b480e2e9 /scss/_button-group.scss | |
| parent | 1109ecc3076e4eab8de33866cc63bd8ae3657ed2 (diff) | |
| parent | 5dae7f04495aca9cf3511ecb2c7bfa5337cc3dac (diff) | |
Merge branch 'btn_input_split_variables' of https://github.com/isychev/bootstrap into isychev-btn_input_split_variables
Diffstat (limited to 'scss/_button-group.scss')
| -rw-r--r-- | scss/_button-group.scss | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scss/_button-group.scss b/scss/_button-group.scss index 12d4982aab..2ed2f7ac75 100644 --- a/scss/_button-group.scss +++ b/scss/_button-group.scss @@ -28,7 +28,7 @@ .btn + .btn-group, .btn-group + .btn, .btn-group + .btn-group { - margin-left: -$input-btn-border-width; + margin-left: -$btn-border-width; } } @@ -101,8 +101,8 @@ // .btn + .dropdown-toggle-split { - padding-right: $input-btn-padding-x * .75; - padding-left: $input-btn-padding-x * .75; + padding-right: $btn-padding-x * .75; + padding-left: $btn-padding-x * .75; &::after { margin-left: 0; @@ -110,13 +110,13 @@ } .btn-sm + .dropdown-toggle-split { - padding-right: $input-btn-padding-x-sm * .75; - padding-left: $input-btn-padding-x-sm * .75; + padding-right: $btn-padding-x-sm * .75; + padding-left: $btn-padding-x-sm * .75; } .btn-lg + .dropdown-toggle-split { - padding-right: $input-btn-padding-x-lg * .75; - padding-left: $input-btn-padding-x-lg * .75; + padding-right: $btn-padding-x-lg * .75; + padding-left: $btn-padding-x-lg * .75; } @@ -150,7 +150,7 @@ > .btn + .btn-group, > .btn-group + .btn, > .btn-group + .btn-group { - margin-top: -$input-btn-border-width; + margin-top: -$btn-border-width; margin-left: 0; } |