From f87e56c571438d8fa3e2a54939ab6b68937bf46a Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Mon, 7 Jan 2019 13:14:45 +0000 Subject: [PATCH] [FIX] web, website: adapt accordion to bootstrap update Some update to the accordion component made it incompatible with some of our customization. --- addons/web/static/src/scss/bootstrap_review.scss | 9 +++++++++ addons/website/static/src/scss/website.scss | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/scss/bootstrap_review.scss b/addons/web/static/src/scss/bootstrap_review.scss index a310bb5ebd8..b55e454d723 100644 --- a/addons/web/static/src/scss/bootstrap_review.scss +++ b/addons/web/static/src/scss/bootstrap_review.scss @@ -31,6 +31,15 @@ @include border-bottom-radius($card-inner-border-radius); } } +.accordion { + .collapsing, .collapse.show { + > .card-body:first-child { + // Above background color would overflow on the card-header border + // without this + margin-top: $card-border-width; + } + } +} // Modify modals so that their scrollable element is the modal-body (except in // mobile). diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss index e1c7bff9750..21ee1c74f73 100644 --- a/addons/website/static/src/scss/website.scss +++ b/addons/website/static/src/scss/website.scss @@ -392,8 +392,6 @@ table.table_desc tr td { // FAQ .s_faq_collapse { .accordion .card { - border-bottom: 1px solid rgba(0, 0, 0, 0.125); - margin: 5px 0; .card-header { cursor: pointer; display: inline-block;