diff options
| author | qsm-odoo <qsm@odoo.com> | 2019-01-04 15:54:41 +0000 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2019-01-09 14:03:47 +0000 |
| commit | 63e52e6acfabb927aad6eaf7b020520dc206e50f (patch) | |
| tree | 7ac19d4cfe28d18b58a7aadee3dfb9f2a84c8e46 /addons/web/static/lib/bootstrap/scss/_button-group.scss | |
| parent | 303220f21421534ae49422aade94c385f785acff (diff) | |
[IMP] web: update bootstrap from 4.1.3 to 4.2.1
This commit only updates the existing bootstrap files and add the new
ones the update brings.
Diffstat (limited to 'addons/web/static/lib/bootstrap/scss/_button-group.scss')
| -rw-r--r-- | addons/web/static/lib/bootstrap/scss/_button-group.scss | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/addons/web/static/lib/bootstrap/scss/_button-group.scss b/addons/web/static/lib/bootstrap/scss/_button-group.scss index 54951703459..d7220029ad1 100644 --- a/addons/web/static/lib/bootstrap/scss/_button-group.scss +++ b/addons/web/static/lib/bootstrap/scss/_button-group.scss @@ -9,7 +9,7 @@ > .btn { position: relative; - flex: 0 1 auto; + flex: 1 1 auto; // Bring the hover, focused, and "active" buttons to the front to overlay // the borders properly @@ -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 |