From cfd36dfa00f8d442237db4ca837eb3dec70d9e32 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Tue, 7 Jul 2026 10:13:45 +0200
Subject: [PATCH 1/5] convert old button

---
 .../admin/account/notifications/side_panel.html.twig      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/bundle/Resources/views/themes/admin/account/notifications/side_panel.html.twig b/src/bundle/Resources/views/themes/admin/account/notifications/side_panel.html.twig
index 244c805445..3fcb7d2b0e 100644
--- a/src/bundle/Resources/views/themes/admin/account/notifications/side_panel.html.twig
+++ b/src/bundle/Resources/views/themes/admin/account/notifications/side_panel.html.twig
@@ -59,8 +59,12 @@
     message: 'notification.modal.delete.confirm_message'|trans({}, 'ibexa_notifications')|desc('Are you sure you want to delete this notification?'),
 } %}
     {% block confirm_button %}
-        <button class="btn ibexa-btn ibexa-btn--primary ibexa-notifications-modal--delete--confirm" data-bs-dismiss="modal">
+        <twig:ibexa:button
+            type="primary"
+            class="ibexa-notifications-modal--delete--confirm"
+            data-bs-dismiss="modal"
+        >
             {{ 'modal.delete'|trans|desc('Delete') }}
-        </button>
+        </twig:ibexa:button>
     {% endblock %}
 {% endembed %}

From 74602ca573f4bc06f253df5f08dbbd87adebf4e1 Mon Sep 17 00:00:00 2001
From: katarzynazawada <katarzyna.zawada@ibexa.co>
Date: Tue, 7 Jul 2026 10:40:45 +0200
Subject: [PATCH 2/5] Adjusted selector for language checkbox

---
 src/lib/Behat/Page/LanguagePage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Behat/Page/LanguagePage.php b/src/lib/Behat/Page/LanguagePage.php
index d84d2172e2..170bb3f21e 100644
--- a/src/lib/Behat/Page/LanguagePage.php
+++ b/src/lib/Behat/Page/LanguagePage.php
@@ -137,7 +137,7 @@ protected function specifyLocators(): array
         return [
             new VisibleCSSLocator('pageTitle', '.ibexa-page-title h1'),
             new VisibleCSSLocator('button', '.ids-btn'),
-            new VisibleCSSLocator('enabledField', '.ibexa-input--checkbox'),
+            new VisibleCSSLocator('enabledField', '.ids-input--checkbox'),
             new VisibleCSSLocator('languagePropertiesItem', '.ibexa-details__item'),
             new VisibleCSSLocator('languagePropertiesLabel', '.ibexa-details__item-label'),
             new VisibleCSSLocator('languagePropertiesValue', '.ibexa-details__item-content'),

From 8c0ea072fd0690d427776b610c25ab5c33738dde Mon Sep 17 00:00:00 2001
From: katarzynazawada <katarzyna.zawada@ibexa.co>
Date: Tue, 7 Jul 2026 10:53:12 +0200
Subject: [PATCH 3/5] Adjusted keyword selector

---
 src/lib/Behat/Component/Fields/Keywords.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Behat/Component/Fields/Keywords.php b/src/lib/Behat/Component/Fields/Keywords.php
index 69a0edd8e8..4172858b12 100644
--- a/src/lib/Behat/Component/Fields/Keywords.php
+++ b/src/lib/Behat/Component/Fields/Keywords.php
@@ -18,7 +18,7 @@ final class Keywords extends FieldTypeComponent
     private string $setKeywordsValueScript = <<<SCRIPT
         const SELECTOR_TAGGIFY = '.ibexa-data-source__taggify';
         const taggifyContainer = document.querySelector(SELECTOR_TAGGIFY);
-        const keywordInput = taggifyContainer.closest('.ibexa-data-source').querySelector('.ibexa-data-source__input-wrapper .ibexa-data-source__input.form-control');
+        const keywordInput = taggifyContainer.closest('.ibexa-data-source').querySelector('.ibexa-data-source__input-wrapper .ibexa-data-source__input');
         class KeywordTaggify extends window.ibexa.core.Taggify {
             afterTagsUpdate() {
                 const tags = [...this.tags];

From e43f69c3b726cf65717de91858e7abf43a5418cd Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Wed, 8 Jul 2026 09:26:20 +0200
Subject: [PATCH 4/5] fix label scss

---
 src/bundle/Resources/public/scss/_labels.scss | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/src/bundle/Resources/public/scss/_labels.scss b/src/bundle/Resources/public/scss/_labels.scss
index 874da43f6d..620de71298 100644
--- a/src/bundle/Resources/public/scss/_labels.scss
+++ b/src/bundle/Resources/public/scss/_labels.scss
@@ -5,32 +5,6 @@
 .ids-label {
     @include label-required();
 
-    & {
-        font-size: $ibexa-text-font-size-small;
-        color: $ibexa-color-dark-400;
-        line-height: calculateRem(18px);
-        margin-bottom: calculateRem(8px);
-        padding-top: 0;
-        padding-bottom: 0;
-    }
-
-    .ibexa-icon {
-        fill: $ibexa-color-dark-400;
-    }
-
-    &--checkbox-radio {
-        font-size: calculateRem(14px);
-        line-height: calculateRem(21px);
-        color: $ibexa-color-dark;
-        margin: 0 0 calculateRem(9px);
-
-        &.required {
-            &:after {
-                content: '';
-            }
-        }
-    }
-
     &.form-label.is-invalid {
         color: $ibexa-color-danger;
     }

From 719bbe66f1fc8d89a9fe9cf185618d8bd3de93fd Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Tue, 14 Jul 2026 10:33:14 +0200
Subject: [PATCH 5/5] fix selector in form.validation.helper.js

---
 .../js/scripts/helpers/form.validation.helper.js      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js b/src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js
index 36eb265b23..1e1f8a1c4f 100644
--- a/src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js
+++ b/src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js
@@ -1,6 +1,9 @@
 import { getTranslator } from './context.helper';
 import { getIconPath } from './icon.helper';
 
+const SELECTOR_INPUT = '.ids-input, .ibexa-input';
+const SELECTOR_LABEL = '.ids-label';
+
 const formatErrorLine = (errorMessage) => {
     const errorIcon = `<svg class="ibexa-icon ibexa-icon--small-medium ibexa-form-error__icon">
         <use xlink:href="${getIconPath('notice')}"></use>
@@ -17,8 +20,8 @@ const formatErrorLine = (errorMessage) => {
 const checkIsEmpty = (field) => {
     let errorMessage = '';
     const Translator = getTranslator();
-    const input = field.querySelector('.ibexa-input');
-    const label = field.querySelector('.ids-label');
+    const input = field.querySelector(SELECTOR_INPUT);
+    const label = field.querySelector(SELECTOR_LABEL);
 
     if (label) {
         const fieldName = label.innerText;
@@ -34,8 +37,8 @@ const checkIsEmpty = (field) => {
     };
 };
 const validateIsEmptyField = (field) => {
-    const input = field.querySelector('.ibexa-input');
-    const label = field.querySelector('.ids-label');
+    const input = field.querySelector(SELECTOR_INPUT);
+    const label = field.querySelector(SELECTOR_LABEL);
     const errorWrapper = field.querySelector('.ibexa-form-error');
     const validatorOutput = checkIsEmpty(field);
     const { isValid, errorMessage } = validatorOutput;