Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(meta): update meta list display - FRONT-4419 #3400

Merged
merged 2 commits into from
Jun 17, 2024
Merged

feat(meta): update meta list display - FRONT-4419 #3400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b49e303
update meta list
emeryro May 23, 2024
ff5a471
Merge branch 'v4-dev' into FRONT-4419-array-kit-update
emeryro Jun 11, 2024
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
96 changes: 48 additions & 48 deletions src/implementations/twig/components/file/__snapshots__/file.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@ exports[`File Thumbnail renders correctly 1`] = `
highlighted
</span>
</div>
<div
<ul
class="ecl-file__detail-meta"
>
<span
<li
class="ecl-file__detail-meta-item"
>
META INFO
</span>
<span
</li>
<li
class="ecl-file__detail-meta-item"
>
DD Month YYYY
</span>
</div>
</li>
</ul>
<div
class="ecl-file__title"
id="ecl-file-with-thumbnail-title"
Expand Down Expand Up @@ -305,20 +305,20 @@ exports[`File Thumbnail renders correctly with taxonomies 1`] = `
highlighted
</span>
</div>
<div
<ul
class="ecl-file__detail-meta"
>
<span
<li
class="ecl-file__detail-meta-item"
>
META INFO
</span>
<span
</li>
<li
class="ecl-file__detail-meta-item"
>
DD Month YYYY
</span>
</div>
</li>
</ul>
<div
class="ecl-file__title"
id="ecl-file-taxonomy-title"
Expand Down Expand Up @@ -620,20 +620,20 @@ exports[`File Thumbnail renders correctly without an image 1`] = `
highlighted
</span>
</div>
<div
<ul
class="ecl-file__detail-meta"
>
<span
<li
class="ecl-file__detail-meta-item"
>
META INFO
</span>
<span
</li>
<li
class="ecl-file__detail-meta-item"
>
DD Month YYYY
</span>
</div>
</li>
</ul>
<div
class="ecl-file__title"
id="ecl-file-with-thumbnail-title"
Expand Down Expand Up @@ -1605,20 +1605,20 @@ exports[`File Without translation renders correctly 1`] = `
<div
class="ecl-file__info"
>
<div
<ul
class="ecl-file__detail-meta"
>
<span
<li
class="ecl-file__detail-meta-item"
>
META INFO
</span>
<span
</li>
<li
class="ecl-file__detail-meta-item"
>
DD Month YYYY
</span>
</div>
</li>
</ul>
<div
class="ecl-file__title"
id="ecl-file-without-translations-title"
Expand Down Expand Up @@ -1699,20 +1699,20 @@ exports[`File Without translation renders correctly with a single label 1`] = `
highlight
</span>
</div>
<div
<ul
class="ecl-file__detail-meta"
>
<span
<li
class="ecl-file__detail-meta-item"
>
META INFO
</span>
<span
</li>
<li
class="ecl-file__detail-meta-item"
>
DD Month YYYY
</span>
</div>
</li>
</ul>
<div
class="ecl-file__title"
id="ecl-file-without-translations-title"
Expand Down Expand Up @@ -1786,20 +1786,20 @@ exports[`File Without translation renders correctly with extra attributes 1`] =
<div
class="ecl-file__info"
>
<div
<ul
class="ecl-file__detail-meta"
>
<span
<li
class="ecl-file__detail-meta-item"
>
META INFO
</span>
<span
</li>
<li
class="ecl-file__detail-meta-item"
>
DD Month YYYY
</span>
</div>
</li>
</ul>
<div
class="ecl-file__title"
id="ecl-file-without-translations-title"
Expand Down Expand Up @@ -1871,20 +1871,20 @@ exports[`File Without translation renders correctly with extra class names 1`] =
<div
class="ecl-file__info"
>
<div
<ul
class="ecl-file__detail-meta"
>
<span
<li
class="ecl-file__detail-meta-item"
>
META INFO
</span>
<span
</li>
<li
class="ecl-file__detail-meta-item"
>
DD Month YYYY
</span>
</div>
</li>
</ul>
<div
class="ecl-file__title"
id="ecl-file-without-translations-title"
Expand Down Expand Up @@ -1974,20 +1974,20 @@ exports[`File Without translation renders correctly with multiple labels 1`] = `
important
</span>
</div>
<div
<ul
class="ecl-file__detail-meta"
>
<span
<li
class="ecl-file__detail-meta-item"
>
META INFO
</span>
<span
</li>
<li
class="ecl-file__detail-meta-item"
>
DD Month YYYY
</span>
</div>
</li>
</ul>
<div
class="ecl-file__title"
id="ecl-file-without-translations-title"
Expand Down
6 changes: 3 additions & 3 deletions src/implementations/twig/components/file/file.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
{% for meta_detail in _detail_meta %}
{% set _meta_detail_string %}
{{ _meta_detail_string }}
<span class="ecl-file__detail-meta-item">{{ meta_detail }}</span>
<li class="ecl-file__detail-meta-item">{{ meta_detail }}</li>
{% endset %}
{% endfor %}
{% endif %}
Expand Down Expand Up @@ -130,9 +130,9 @@
{% endfor %}
{% endif %}
{% if _meta_detail_string is not empty %}
<div class="ecl-file__detail-meta">
<ul class="ecl-file__detail-meta">
{{- _meta_detail_string -}}
</div>
</ul>
{% endif %}
{% if _title is not empty %}
<div class="ecl-file__title" id="{{ _title_id }}">
Expand Down
48 changes: 24 additions & 24 deletions src/implementations/twig/components/page-header/__snapshots__/page-header.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,20 +84,20 @@ exports[`Page Header Standardised Background image - renders correctly 1`] = `
<div
class="ecl-page-header__info"
>
<div
<ul
class="ecl-page-header__meta"
>
<span
<li
class="ecl-page-header__meta-item"
>
Meta info
</span>
<span
</li>
<li
class="ecl-page-header__meta-item"
>
DD Month YYYY
</span>
</div>
</li>
</ul>
<h1
class="ecl-page-header__title"
>
Expand Down Expand Up @@ -204,20 +204,20 @@ exports[`Page Header Standardised Default - renders correctly 1`] = `
<div
class="ecl-page-header__info"
>
<div
<ul
class="ecl-page-header__meta"
>
<span
<li
class="ecl-page-header__meta-item"
>
Meta info
</span>
<span
</li>
<li
class="ecl-page-header__meta-item"
>
DD Month YYYY
</span>
</div>
</li>
</ul>
<h1
class="ecl-page-header__title"
>
Expand Down Expand Up @@ -414,20 +414,20 @@ exports[`Page Header Standardised Default renders correctly with extra attribute
<div
class="ecl-page-header__info"
>
<div
<ul
class="ecl-page-header__meta"
>
<span
<li
class="ecl-page-header__meta-item"
>
Meta info
</span>
<span
</li>
<li
class="ecl-page-header__meta-item"
>
DD Month YYYY
</span>
</div>
</li>
</ul>
<h1
class="ecl-page-header__title"
>
Expand Down Expand Up @@ -525,20 +525,20 @@ exports[`Page Header Standardised Default renders correctly with extra class nam
<div
class="ecl-page-header__info"
>
<div
<ul
class="ecl-page-header__meta"
>
<span
<li
class="ecl-page-header__meta-item"
>
Meta info
</span>
<span
</li>
<li
class="ecl-page-header__meta-item"
>
DD Month YYYY
</span>
</div>
</li>
</ul>
<h1
class="ecl-page-header__title"
>
Expand Down
6 changes: 3 additions & 3 deletions src/implementations/twig/components/page-header/page-header.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@
{% endif %}
<div class="{{ _info_classes }}">
{% if _meta is not empty %}
<div class="ecl-page-header__meta">
<ul class="ecl-page-header__meta">
{% for _item in _meta %}
<span class="ecl-page-header__meta-item">{{- _item -}}</span>
<li class="ecl-page-header__meta-item">{{- _item -}}</li>
{% endfor %}
</div>
</ul>
{% endif %}

{% if _title is not empty %}
Expand Down
2 changes: 1 addition & 1 deletion src/implementations/vanilla/components/content-block/content-block.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ $content-block: null !default;
.ecl-content-block__primary-meta-container {
color: map.get($content-block, 'primary_meta-color');
display: inline-block;
font: var(--f-s);
font: var(--f-ui-s);
list-style: none;
margin: map.get($content-block, 'primary-meta-margin');
padding: 0;
Expand Down
Loading
Loading