From f57e2249319813aaff1cb4e58382194e1b1bf5fe Mon Sep 17 00:00:00 2001
From: Aleksandra Bozek <aleksandra.m.bozek@gmail.com>
Date: Thu, 31 Jul 2025 15:11:23 +0200
Subject: [PATCH 1/2] IBX-10398: Modal close btn styles update

---
 src/bundle/Resources/public/scss/_modals.scss                | 1 +
 .../views/themes/admin/ui/component/modal/modal.html.twig    | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/bundle/Resources/public/scss/_modals.scss b/src/bundle/Resources/public/scss/_modals.scss
index b720929f1e..e74906bf89 100644
--- a/src/bundle/Resources/public/scss/_modals.scss
+++ b/src/bundle/Resources/public/scss/_modals.scss
@@ -16,6 +16,7 @@
 
         .close {
             @include close-button();
+            padding: calculateRem(2px);
         }
     }
 
diff --git a/src/bundle/Resources/views/themes/admin/ui/component/modal/modal.html.twig b/src/bundle/Resources/views/themes/admin/ui/component/modal/modal.html.twig
index 5b669cb280..c38fea1445 100644
--- a/src/bundle/Resources/views/themes/admin/ui/component/modal/modal.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/component/modal/modal.html.twig
@@ -53,17 +53,18 @@
 {% set close_btn_title = 'close_btn.title'|trans({}, 'ibexa_modal')|desc('Close') %}
 {% set close_btn_aria_label = 'close_btn.aria_label'|trans({}, 'ibexa_modal')|desc('Close') %}
 {% set attr_close_btn = attr_close_btn|default({})|merge({
-    class: ('close ' ~ attr_close_btn.class|default(''))|trim,
+    class: ('close ibexa-btn ibexa-btn--ghost ' ~ attr_close_btn.class|default(''))|trim,
     type: attr_close_btn.type|default('button'),
     title: attr_close_btn.title|default(close_btn_title),
     'data-bs-dismiss': attr_close_btn['data-bs-dismiss']|default('modal'),
+    'data-tooltip-container-selector': '.modal-dialog',
     'aria-label': attr_close_btn['aria-label']|default(close_btn_aria_label),
 }) %}
 
 {% set close_btn %}
     <button {{ html.attributes(attr_close_btn) }}>
         <svg
-            class="ibexa-icon ibexa-icon--small-medium"
+            class="ibexa-icon ibexa-icon--medium"
             aria-hidden="true"
         >
             <use xlink:href="{{ ibexa_icon_path('discard') }}"></use>

From 2ceb5a83a2150610f7bdf2f6b113b93e72125e5d Mon Sep 17 00:00:00 2001
From: Aleksandra Bozek <aleksandra.m.bozek@gmail.com>
Date: Wed, 6 Aug 2025 14:10:39 +0200
Subject: [PATCH 2/2] after review

---
 src/bundle/Resources/public/scss/_modals.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/bundle/Resources/public/scss/_modals.scss b/src/bundle/Resources/public/scss/_modals.scss
index e74906bf89..e2e53774ef 100644
--- a/src/bundle/Resources/public/scss/_modals.scss
+++ b/src/bundle/Resources/public/scss/_modals.scss
@@ -16,7 +16,10 @@
 
         .close {
             @include close-button();
-            padding: calculateRem(2px);
+
+            & {
+                padding: calculateRem(2px);
+            }
         }
     }