Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"ibexa/content-forms": "~5.0.x-dev",
"ibexa/core": "~5.0.x-dev",
"ibexa/design-engine": "~5.0.x-dev",
"ibexa/design-system-twig": "~5.0.x-dev",
"ibexa/polyfill-php82": "^1.0",
"ibexa/rest": "~5.0.x-dev",
"ibexa/search": "~5.0.x-dev",
Expand Down Expand Up @@ -97,5 +98,11 @@
"branch-alias": {
"dev-main": "5.0.x-dev"
}
}
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/ibexa/design-system-twig"
}
]
}
3 changes: 2 additions & 1 deletion src/bundle/Resources/public/scss/_page-title.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
white-space: nowrap;
}

.ibexa-badge {
.ibexa-badge,
.ids-tag {
margin-left: calculateRem(16px);
font-family: $ibexa-font-family;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,9 @@
</div>

{% for role_assigment in roles %}
<div class="ibexa-tag">
<div class="ibexa-tag__content">
{{ role_assigment.identifier }}
</div>
</div>
<twig:ibexa:tag type="neutral">
{{ role_assigment.identifier }}
</twig:ibexa:tag>
{% endfor %}
</div>
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,9 @@
}) }}
{% else %}
<li class="mt-2">
<div class="ibexa-tag">
<div class="ibexa-tag__content">
{{ "role.policy.limitation.location_deleted"|trans({}, 'ibexa_content_forms_role')|desc("Location deleted") }}
</div>
</div>
<twig:ibexa:tag type="neutral">
{{ "role.policy.limitation.location_deleted"|trans({}, 'ibexa_content_forms_role')|desc("Location deleted") }}
</twig:ibexa:tag>
</li>
{% endif %}
{% endfor %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,21 +150,21 @@
{% set attr = attr|merge({'class': (attr.class|default('') ~ ' ibexa-field-preview ibexa-field-preview--ibexa_selection-multiple')|trim}) %}
<ul {{ block( 'field_attributes' ) }}>
{% for selectedIndex in field.value.selection %}
<li class="ibexa-selection__item ibexa-tag">
<div class="ibexa-tag__content">
<li class="ibexa-selection__item">
<twig:ibexa:tag type="neutral">
{{ options[selectedIndex] }}
</div>
</twig:ibexa:tag>
</li>
{% endfor %}
</ul>
{% 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 %}

<div class="ibexa-tag__content">
<twig:ibexa:tag type="neutral">
{{ block( 'simple_block_field' ) }}
</div>
</twig:ibexa:tag>
{% endif %}
{% endblock %}

Expand Down
17 changes: 7 additions & 10 deletions src/bundle/Resources/views/themes/admin/ui/page_title.html.twig
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
{% import '@ibexadesign/ui/component/macros.html.twig' as html %}

{% if title is defined %}
<div class="ibexa-page-title {% if page_title_class is defined %}{{ page_title_class }}{% endif %}">
<div class="ibexa-page-title__top">
<h1 class="ibexa-page-title__title">
<span class="ibexa-page-title__content" title="{{ title }}">{{ title }}</span>
{% block tag %}
{% if tag is defined %}
{% set attr = tag_attr|default({})|merge({
class: (tag_attr.class|default('')
~ ' ibexa-badge ' ~ tag_extra_classes|default('')
)|trim,
}) %}

<div {{ html.attributes(attr) }}>
{% set tag_attr = tag_attr|default({}) %}
<twig:ibexa:tag
:type="tag_type|default('neutral')"
class="{{ (tag_attr.class|default('') ~ ' ' ~ tag_extra_classes|default(''))|trim }}"
style="{{ tag_attr.style|default('') }}"
>
{{ tag }}
</div>
</twig:ibexa:tag>
{% endif %}
{% endblock %}
</h1>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@

<div class="ibexa-search-criteria-tags">
{% if form.children.search_language.vars.value != '' %}
<div class="ibexa-tag ibexa-search-criteria-tags__tag">
<div class="ibexa-tag__content">
{{ 'search.in_language'|trans({
'%search_language%': form.children.search_language.vars.data.name,
})|desc('in %search_language%')}}
</div>
</div>
<twig:ibexa:tag type="neutral" class="ibexa-search-criteria-tags__tag">
{{ 'search.in_language'|trans({
'%search_language%': form.children.search_language.vars.data.name,
})|desc('in %search_language%')}}
</twig:ibexa:tag>
{% endif %}

{% if form.content_types.vars.data is not empty %}
Expand Down
1 change: 1 addition & 0 deletions src/bundle/Resources/views/themes/admin/ui/tag.html.twig
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{# TODO IBX-11417: Migrate to <twig:ibexa:chip> when DS chip supports a loading/spinner state (ibexa-tag__spinner / is_loading_state) #}
{% import '@ibexadesign/ui/component/macros.html.twig' as html %}

{% set is_deletable = is_deletable is defined ? is_deletable : true %}
Expand Down
Loading