From 299142258427b5581ccdf58f30aad66c4c62d9bc Mon Sep 17 00:00:00 2001
From: Jonas Eberle <flightvision@googlemail.com>
Date: Thu, 9 Nov 2023 15:40:20 +0100
Subject: [PATCH] task: remove bootstrap_package workaround

https://github.com/benjaminkott/bootstrap_package/pull/775 is merged
---
 .../Themes/bootstrap4-modal/Templates/Popup.html     |  6 +-----
 .../Themes/bootstrap4-modal/cookieman-theme.css      | 12 ------------
 .../Themes/bootstrap4-modal/cookieman-theme.min.css  |  2 +-
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html b/Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html
index 5064b492e..a70d12d75 100644
--- a/Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html
+++ b/Resources/Private/Themes/bootstrap4-modal/Templates/Popup.html
@@ -29,11 +29,7 @@
                     <form data-cookieman-form class="mt-3"
                           data-cookieman-dnt-enabled="{f:translate(key: 'browser.dnt-enabled', extensionName: 'cookieman')}"
                     >
-                        <f:comment>
-                            should have class="accordion"; due to incompatiblity with bootstrap_package
-                            left out at the moment - https://github.com/benjaminkott/bootstrap_package/pull/775
-                        </f:comment>
-                        <div id="cookieman-acco">
+                        <div id="cookieman-acco" class="accordion">
                             <f:for each="{settings.groups}" key="groupId" as="group">
                                 <div class="card">
                                     <div class="card-header" id="cookieman-acco-h-{groupId}">
diff --git a/Resources/Public/Themes/bootstrap4-modal/cookieman-theme.css b/Resources/Public/Themes/bootstrap4-modal/cookieman-theme.css
index baf1f42f0..42daeedf8 100644
--- a/Resources/Public/Themes/bootstrap4-modal/cookieman-theme.css
+++ b/Resources/Public/Themes/bootstrap4-modal/cookieman-theme.css
@@ -1,15 +1,3 @@
-/**
-duplicates Bootstrap4's ‹.accordion > .card:first-of-type› for bootstrap_package compatibility
-https://github.com/benjaminkott/bootstrap_package/pull/775
- */
-#cookieman-acco > .card {
-    overflow: hidden;
-}
-#cookieman-acco > .card:first-of-type,
-#cookieman-acco > .card:not(:first-of-type):not(:last-of-type) {
-    border-bottom: 0;
-}
-
 #cookieman-modal table {
     font-size: 80%;
 }
diff --git a/Resources/Public/Themes/bootstrap4-modal/cookieman-theme.min.css b/Resources/Public/Themes/bootstrap4-modal/cookieman-theme.min.css
index fb00c5fc2..700ca62a1 100644
--- a/Resources/Public/Themes/bootstrap4-modal/cookieman-theme.min.css
+++ b/Resources/Public/Themes/bootstrap4-modal/cookieman-theme.min.css
@@ -1 +1 @@
-#cookieman-acco>.card{overflow:hidden}#cookieman-acco>.card:first-of-type,#cookieman-acco>.card:not(:first-of-type):not(:last-of-type){border-bottom:0}#cookieman-modal table{font-size:80%}#cookieman-modal [data-toggle=collapse]:after{content:"+";font-size:2.5rem;opacity:.7;position:absolute;right:12px;top:50%;line-height:0;transition:transform ease-in-out .3s;transform-origin:center;transform:rotate(45deg)}#cookieman-modal [data-toggle=collapse].collapsed:after{transform:rotate(0)}#cookieman-settings .card-header{position:relative}#cookieman-modal [data-toggle=collapse][data-target="#cookieman-settings"]{position:relative}#cookieman-modal [data-toggle=collapse][data-target="#cookieman-settings"]:after{font-size:2rem}
+#cookieman-modal table{font-size:80%}#cookieman-modal [data-toggle=collapse]:after{content:"+";font-size:2.5rem;opacity:.7;position:absolute;right:12px;top:50%;line-height:0;transition:transform ease-in-out .3s;transform-origin:center;transform:rotate(45deg)}#cookieman-modal [data-toggle=collapse].collapsed:after{transform:rotate(0)}#cookieman-settings .card-header{position:relative}#cookieman-modal [data-toggle=collapse][data-target="#cookieman-settings"]{position:relative}#cookieman-modal [data-toggle=collapse][data-target="#cookieman-settings"]:after{font-size:2rem}