diff options
| author | ysds <[email protected]> | 2018-11-04 15:50:21 +0900 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2018-11-04 08:50:21 +0200 |
| commit | ea8f6c6ff322587c4bc1bb7609137575c8ebaa52 (patch) | |
| tree | d71308a73f8c0577038dba987bd06a5f45bc70f2 /scss | |
| parent | d27509688d3af428bb342265e4e7cf4ace52b5fa (diff) | |
| download | bootstrap-ea8f6c6ff322587c4bc1bb7609137575c8ebaa52.tar.xz bootstrap-ea8f6c6ff322587c4bc1bb7609137575c8ebaa52.zip | |
Button group refactoring and fixes (#25395)
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_button-group.scss | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/scss/_button-group.scss b/scss/_button-group.scss index 549517034..716cf5208 100644 --- a/scss/_button-group.scss +++ b/scss/_button-group.scss @@ -22,14 +22,6 @@ z-index: 1; } } - - // Prevent double borders when buttons are next to each other - .btn + .btn, - .btn + .btn-group, - .btn-group + .btn, - .btn-group + .btn-group { - margin-left: -$btn-border-width; - } } // Optional: Group multiple button groups together for a toolbar @@ -44,8 +36,10 @@ } .btn-group { - > .btn:first-child { - margin-left: 0; + // Prevent double borders when buttons are next to each other + > .btn:not(:first-child), + > .btn-group:not(:first-child) { + margin-left: -$btn-border-width; } // Reset rounded corners @@ -119,17 +113,14 @@ align-items: flex-start; justify-content: center; - .btn, - .btn-group { + > .btn, + > .btn-group { width: 100%; } - > .btn + .btn, - > .btn + .btn-group, - > .btn-group + .btn, - > .btn-group + .btn-group { + > .btn:not(:first-child), + > .btn-group:not(:first-child) { margin-top: -$btn-border-width; - margin-left: 0; } // Reset rounded corners |