diff --git a/composer.json b/composer.json
index 97beea181e..e34fc9058c 100644
--- a/composer.json
+++ b/composer.json
@@ -27,6 +27,7 @@
"ibexa/content-forms": "~6.0.x-dev",
"ibexa/core": "~6.0.x-dev",
"ibexa/design-engine": "~6.0.x-dev",
+ "ibexa/design-system-twig": "~6.0.x-dev",
"ibexa/rest": "~6.0.x-dev",
"ibexa/search": "~6.0.x-dev",
"ibexa/twig-components": "~6.0.x-dev",
@@ -97,5 +98,11 @@
"branch-alias": {
"dev-main": "6.0.x-dev"
}
- }
+ },
+ "repositories": [
+ {
+ "type": "vcs",
+ "url": "https://github.com/ibexa/design-system-twig"
+ }
+ ]
}
diff --git a/src/bundle/Resources/encore/ibexa.css.config.js b/src/bundle/Resources/encore/ibexa.css.config.js
index 62dfba962e..7fd3ddf71b 100644
--- a/src/bundle/Resources/encore/ibexa.css.config.js
+++ b/src/bundle/Resources/encore/ibexa.css.config.js
@@ -5,6 +5,7 @@ module.exports = (Encore) => {
path.resolve(__dirname, '../public/scss/ibexa-bootstrap.scss'),
path.resolve(__dirname, '../public/scss/ibexa.scss'),
path.resolve(__dirname, '../public/scss/ui/ibexa-modules.scss'),
+ path.resolve('./vendor/ibexa/admin-ui-assets/src/bundle/Resources/public/vendors/ids-assets/dist/css/styles.css'),
path.resolve('./vendor/ibexa/admin-ui-assets/src/bundle/Resources/public/vendors/flatpickr/dist/flatpickr.min.css'),
path.resolve(
'./vendor/ibexa/admin-ui-assets/src/bundle/Resources/public/vendors/flatpickr/dist/plugins/confirmDate/confirmDate.css',
@@ -18,6 +19,7 @@ module.exports = (Encore) => {
])
.addEntry('ibexa-admin-ui-security-base-css', [
path.resolve(__dirname, '../public/scss/ibexa-bootstrap.scss'),
+ path.resolve('./vendor/ibexa/admin-ui-assets/src/bundle/Resources/public/vendors/ids-assets/dist/css/styles.css'),
path.resolve(__dirname, '../public/scss/ibexa.scss'),
]);
};
diff --git a/src/bundle/Resources/public/scss/_page-title.scss b/src/bundle/Resources/public/scss/_page-title.scss
index 05780acda0..e01aa60f7e 100644
--- a/src/bundle/Resources/public/scss/_page-title.scss
+++ b/src/bundle/Resources/public/scss/_page-title.scss
@@ -28,7 +28,8 @@
white-space: nowrap;
}
- .ibexa-badge {
+ .ibexa-badge,
+ .ids-tag {
margin-left: calculateRem(16px);
font-family: $ibexa-font-family;
}
diff --git a/src/bundle/Resources/views/themes/admin/account/profile/view.html.twig b/src/bundle/Resources/views/themes/admin/account/profile/view.html.twig
index 0f56a61756..0c179e5d48 100644
--- a/src/bundle/Resources/views/themes/admin/account/profile/view.html.twig
+++ b/src/bundle/Resources/views/themes/admin/account/profile/view.html.twig
@@ -91,11 +91,9 @@
{% for role_assigment in roles %}
-
-
- {{ role_assigment.identifier }}
-
-
+
+ {{ role_assigment.identifier }}
+
{% endfor %}
{% endif %}
diff --git a/src/bundle/Resources/views/themes/admin/limitation/udw_limitation_value.html.twig b/src/bundle/Resources/views/themes/admin/limitation/udw_limitation_value.html.twig
index 79d0021a7a..d0095dc4c4 100755
--- a/src/bundle/Resources/views/themes/admin/limitation/udw_limitation_value.html.twig
+++ b/src/bundle/Resources/views/themes/admin/limitation/udw_limitation_value.html.twig
@@ -37,11 +37,9 @@
}) }}
{% else %}
-
-
- {{ "role.policy.limitation.location_deleted"|trans({}, 'ibexa_content_forms_role')|desc("Location deleted") }}
-
-
+
+ {{ "role.policy.limitation.location_deleted"|trans({}, 'ibexa_content_forms_role')|desc("Location deleted") }}
+
{% endif %}
{% endfor %}
diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig
index f8e49d76ec..31fd9ad363 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/preview/content_fields.html.twig
@@ -150,21 +150,24 @@
{% set attr = attr|merge({'class': (attr.class|default('') ~ ' ibexa-field-preview ibexa-field-preview--ibexa_selection-multiple')|trim}) %}
{% elseif not fieldSettings.isMultiple %}
- {% set attr = attr|merge({'class': (attr.class|default('') ~ ' ibexa-field-preview ibexa-field-preview--ibexa_selection-single ibexa-tag')|trim}) %}
+ {% set attr = attr|merge({'class': (attr.class|default('') ~ ' ibexa-field-preview ibexa-field-preview--ibexa_selection-single')|trim}) %}
{% set field_value = options[field.value.selection|first]|escape %}
-
-
+ {% set simple_block_field_content %}
{{ block( 'simple_block_field' ) }}
-
+ {% endset %}
+
+
+ {{ simple_block_field_content }}
+
{% endif %}
{% endblock %}
diff --git a/src/bundle/Resources/views/themes/admin/ui/page_title.html.twig b/src/bundle/Resources/views/themes/admin/ui/page_title.html.twig
index 7e66b6cd0b..46906cf721 100644
--- a/src/bundle/Resources/views/themes/admin/ui/page_title.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/page_title.html.twig
@@ -1,5 +1,3 @@
-{% import '@ibexadesign/ui/component/macros.html.twig' as html %}
-
{% if title is defined %}
@@ -7,15 +5,14 @@
{{ title }}
{% block tag %}
{% if tag is defined %}
- {% set attr = tag_attr|default({})|merge({
- class: (tag_attr.class|default('')
- ~ ' ibexa-badge ' ~ tag_extra_classes|default('')
- )|trim,
- }) %}
-
-
+ {% set tag_attr = tag_attr|default({}) %}
+
+
{% endif %}
{% endblock %}
diff --git a/src/bundle/Resources/views/themes/admin/ui/search/criteria_tags.html.twig b/src/bundle/Resources/views/themes/admin/ui/search/criteria_tags.html.twig
index 4bf8b8dd65..e5838a97a6 100644
--- a/src/bundle/Resources/views/themes/admin/ui/search/criteria_tags.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/search/criteria_tags.html.twig
@@ -2,13 +2,11 @@