From 8a36b29cb6446e01fd7cd255bd7316c0d4d377a9 Mon Sep 17 00:00:00 2001 From: Lukasz Ostafin Date: Wed, 18 May 2022 16:31:20 +0200 Subject: [PATCH 1/3] IBX-2920: Fixed rolled-up styles --- .../public/js/scripts/admin.location.adaptive.tabs.js | 3 +-- src/bundle/Resources/public/scss/_tabs.scss | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bundle/Resources/public/js/scripts/admin.location.adaptive.tabs.js b/src/bundle/Resources/public/js/scripts/admin.location.adaptive.tabs.js index 65e5981b40..e4467fa5d7 100644 --- a/src/bundle/Resources/public/js/scripts/admin.location.adaptive.tabs.js +++ b/src/bundle/Resources/public/js/scripts/admin.location.adaptive.tabs.js @@ -7,10 +7,9 @@ const header = toggler.closest('.ibexa-header'); const headerContainer = header.parentElement; const tabContent = headerContainer.querySelector('.ibexa-tab-content'); - const isTabContentRolledUp = toggler.classList.contains('ibexa-tabs__toggler--rolled-up'); toggler.classList.toggle('ibexa-tabs__toggler--rolled-up'); - tabContent.style.height = isTabContentRolledUp ? '' : '0px'; + tabContent.classList.toggle('ibexa-tab-content--rolled-up'); }; doc.querySelectorAll('.ibexa-tabs__toggler').forEach((toggler) => { diff --git a/src/bundle/Resources/public/scss/_tabs.scss b/src/bundle/Resources/public/scss/_tabs.scss index 693e61beec..97684c1f76 100644 --- a/src/bundle/Resources/public/scss/_tabs.scss +++ b/src/bundle/Resources/public/scss/_tabs.scss @@ -266,4 +266,9 @@ padding: 0; } } + + &--rolled-up { + height: calculateRem(32px); + border-radius: 0 0 calculateRem(10px) calculateRem(10px); + } } From 66978b5bb579552958f289b8cec35aca5e57f5f7 Mon Sep 17 00:00:00 2001 From: Lukasz Ostafin Date: Mon, 23 May 2022 12:51:18 +0200 Subject: [PATCH 2/3] After QA --- src/bundle/Resources/public/scss/_tabs.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bundle/Resources/public/scss/_tabs.scss b/src/bundle/Resources/public/scss/_tabs.scss index 97684c1f76..08f8b3f961 100644 --- a/src/bundle/Resources/public/scss/_tabs.scss +++ b/src/bundle/Resources/public/scss/_tabs.scss @@ -268,7 +268,7 @@ } &--rolled-up { - height: calculateRem(32px); + height: calculateRem(24px); border-radius: 0 0 calculateRem(10px) calculateRem(10px); } } From 03e9eafd6b56dc41f46ea62e0e3f71a969513e29 Mon Sep 17 00:00:00 2001 From: Lukasz Ostafin Date: Mon, 23 May 2022 13:09:17 +0200 Subject: [PATCH 3/3] After CR --- src/bundle/Resources/public/scss/_tabs.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/bundle/Resources/public/scss/_tabs.scss b/src/bundle/Resources/public/scss/_tabs.scss index 08f8b3f961..1f58dde450 100644 --- a/src/bundle/Resources/public/scss/_tabs.scss +++ b/src/bundle/Resources/public/scss/_tabs.scss @@ -270,5 +270,9 @@ &--rolled-up { height: calculateRem(24px); border-radius: 0 0 calculateRem(10px) calculateRem(10px); + + .tab-pane { + opacity: 0; + } } }