task: remove bootstrap_package workaround

benjaminkott/bootstrap_package#775 is merged
dmind-gmbh · Nov 9, 2023 · 2991422 · 2991422
1 parent 957e434
commit 2991422
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git 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
@@ -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