From 22c836ded6866439cb53926fafdc2a361fdb2df6 Mon Sep 17 00:00:00 2001 From: iberdinsky-skilld Date: Sat, 26 Aug 2023 18:34:15 +0200 Subject: [PATCH 1/4] Create new SDC component for Umami (card view mode) - #3347672 --- .../umami/components/card/card.component.yml | 38 +++++++++++ .../themes/umami/components/card/card.css | 65 +++++++++++++++++++ .../themes/umami/components/card/card.twig | 5 ++ .../read-more/read-more.component.yml | 23 +++++++ .../read-more/read-more.css} | 17 ++--- .../umami/components/read-more/read-more.twig | 10 +++ .../components/title/title.component.yml | 38 +++++++++++ .../themes/umami/components/title/title.twig | 5 ++ .../card-common-alt/card-common-alt.css | 8 --- .../content/card-common/card-common.css | 8 --- .../css/components/content/card/card.css | 46 ------------- .../content/node--card-common-alt.html.twig | 35 ++++++++-- .../content/node--card-common.html.twig | 45 ++++++------- .../templates/content/node--card.html.twig | 42 ++++++------ .../themes/umami/umami.libraries.yml | 27 +------- .../demo_umami/themes/umami/umami.theme | 4 ++ 16 files changed, 266 insertions(+), 150 deletions(-) create mode 100644 core/profiles/demo_umami/themes/umami/components/card/card.component.yml create mode 100644 core/profiles/demo_umami/themes/umami/components/card/card.css create mode 100644 core/profiles/demo_umami/themes/umami/components/card/card.twig create mode 100644 core/profiles/demo_umami/themes/umami/components/read-more/read-more.component.yml rename core/profiles/demo_umami/themes/umami/{css/components/navigation/more-link/more-link.css => components/read-more/read-more.css} (65%) create mode 100644 core/profiles/demo_umami/themes/umami/components/read-more/read-more.twig create mode 100644 core/profiles/demo_umami/themes/umami/components/title/title.component.yml create mode 100644 core/profiles/demo_umami/themes/umami/components/title/title.twig delete mode 100644 core/profiles/demo_umami/themes/umami/css/components/content/card-common-alt/card-common-alt.css delete mode 100644 core/profiles/demo_umami/themes/umami/css/components/content/card-common/card-common.css delete mode 100644 core/profiles/demo_umami/themes/umami/css/components/content/card/card.css diff --git a/core/profiles/demo_umami/themes/umami/components/card/card.component.yml b/core/profiles/demo_umami/themes/umami/components/card/card.component.yml new file mode 100644 index 00000000000..f9b2d36c90c --- /dev/null +++ b/core/profiles/demo_umami/themes/umami/components/card/card.component.yml @@ -0,0 +1,38 @@ +# This is so your IDE knows about the syntax for fixes and autocomplete. +$schema: https://git.drupalcode.org/project/drupal/-/raw/10.1.x/core/modules/sdc/src/metadata.schema.json + +# The human readable name. +name: Card + +# Status can be: "experimental", "stable", "deprecated", "obsolete". +status: experimental + +# Schema for the props. We support www.json-schema.org. Learn more about the +# syntax there. +props: + type: object + properties: + attributes: + type: Drupal\Core\Template\Attribute + title: Attributes + description: Wrapper attributes. + html_tag: + type: string + title: HTML tag for wrapper + + # Limit the available options by using enums. + enum: + - article + - div + # Provide a default value + default: article + +# Slots always hold arbitrary markup. We know that beforehand, so no need for +# a schema for slots. +slots: + # The key is the name of the slot. In your template you will use + # {% block content %}. + content: + title: Content + required: true + description: The card content. diff --git a/core/profiles/demo_umami/themes/umami/components/card/card.css b/core/profiles/demo_umami/themes/umami/components/card/card.css new file mode 100644 index 00000000000..27233534d87 --- /dev/null +++ b/core/profiles/demo_umami/themes/umami/components/card/card.css @@ -0,0 +1,65 @@ +.umami-card { + width: 100%; + padding: 1rem; + border: 1px solid #fcece7; + background-color: #fff; +} + +.umami-card__content { + display: grid; + gap: 1.2rem; +} + +.umami-card__label-items { + display: flex; + flex-wrap: wrap; + gap: 0.1rem; + margin: 0; + color: #5f635d; + font-size: 0.889rem; +} + +.umami-card__read-more { + justify-self: start; +} + +.umami-card__title { + flex-grow: 1; + margin: 0; + text-decoration: none; + color: #000; + font-size: 1.424rem; + font-weight: 400; +} + +.umami-card__title a { + text-decoration: none; + color: #000; + background-color: inherit; +} + +.umami-card__title a:hover, +.umami-card__title a:focus { + text-decoration: underline; + color: #000; +} + +.umami-card__wrapper { + display: grid; + gap: 1rem; + grid-template-rows: 1fr auto auto; + height: 100%; +} + +.umami-card--alt .umami-card__wrapper { + grid-template-rows: auto 1fr auto; +} + +.umami-card .field--name-field-media-image { + line-height: 0; +} + +.umami-card .field--name-field-media-image img { + display: block; + width: 100%; +} \ No newline at end of file diff --git a/core/profiles/demo_umami/themes/umami/components/card/card.twig b/core/profiles/demo_umami/themes/umami/components/card/card.twig new file mode 100644 index 00000000000..3da4f9aac91 --- /dev/null +++ b/core/profiles/demo_umami/themes/umami/components/card/card.twig @@ -0,0 +1,5 @@ +<{{html_tag|default('article')}}{{attributes.addClass('umami-card')}}> +
+ {% block content %}{% endblock %} +
+ diff --git a/core/profiles/demo_umami/themes/umami/components/read-more/read-more.component.yml b/core/profiles/demo_umami/themes/umami/components/read-more/read-more.component.yml new file mode 100644 index 00000000000..52efe8048d8 --- /dev/null +++ b/core/profiles/demo_umami/themes/umami/components/read-more/read-more.component.yml @@ -0,0 +1,23 @@ +# This is so your IDE knows about the syntax for fixes and autocomplete. +$schema: https://git.drupalcode.org/project/drupal/-/raw/10.1.x/core/modules/sdc/src/metadata.schema.json + +# The human readable name. +name: Read More + +# Status can be: "experimental", "stable", "deprecated", "obsolete". +status: experimental + +# Schema for the props. We support www.json-schema.org. Learn more about the +# syntax there. +props: + type: object + properties: + a11y: + type: string + title: Read More screen reader text + text: + type: string + title: Read More text + url: + type: string + title: Read More url diff --git a/core/profiles/demo_umami/themes/umami/css/components/navigation/more-link/more-link.css b/core/profiles/demo_umami/themes/umami/components/read-more/read-more.css similarity index 65% rename from core/profiles/demo_umami/themes/umami/css/components/navigation/more-link/more-link.css rename to core/profiles/demo_umami/themes/umami/components/read-more/read-more.css index 0d4f196d4c8..33110078bfd 100644 --- a/core/profiles/demo_umami/themes/umami/css/components/navigation/more-link/more-link.css +++ b/core/profiles/demo_umami/themes/umami/components/read-more/read-more.css @@ -3,7 +3,7 @@ * This file is used to style the more link. */ -.read-more__link { +.read-more { position: relative; display: inline-block; box-sizing: border-box; @@ -13,31 +13,26 @@ border-bottom: 1px solid transparent; background-color: inherit; } -[dir=rtl] .read-more__link { +[dir=rtl] .read-more { padding-right: unset; padding-left: 20px; } -.read-more__link:focus, -.read-more__link:hover { +.read-more:focus, +.read-more:hover { text-decoration: none; color: #008068; border-bottom: 1px solid #008068; background-color: inherit; } -.read-more__link::before { +.read-more__icon { position: absolute; top: 50%; right: 0; /* LTR */ width: 14px; height: 14px; margin-top: -7px; - content: ""; - background-image: url("../../../../images/svg/pointer.svg"); - background-repeat: no-repeat; - background-position: 0 0; - background-size: contain; } -[dir=rtl] .read-more__link::before { +[dir=rtl] .read-more__icon { right: unset; left: 0; transform: rotate(180deg); diff --git a/core/profiles/demo_umami/themes/umami/components/read-more/read-more.twig b/core/profiles/demo_umami/themes/umami/components/read-more/read-more.twig new file mode 100644 index 00000000000..09817e3115e --- /dev/null +++ b/core/profiles/demo_umami/themes/umami/components/read-more/read-more.twig @@ -0,0 +1,10 @@ + + {{ text }} + + + + + + diff --git a/core/profiles/demo_umami/themes/umami/components/title/title.component.yml b/core/profiles/demo_umami/themes/umami/components/title/title.component.yml new file mode 100644 index 00000000000..33f2f7cebf6 --- /dev/null +++ b/core/profiles/demo_umami/themes/umami/components/title/title.component.yml @@ -0,0 +1,38 @@ +# This is so your IDE knows about the syntax for fixes and autocomplete. +$schema: https://git.drupalcode.org/project/drupal/-/raw/10.1.x/core/modules/sdc/src/metadata.schema.json + +# The human readable name. +name: Title + +# Status can be: "experimental", "stable", "deprecated", "obsolete". +status: experimental + +# Schema for the props. We support www.json-schema.org. Learn more about the +# syntax there. +props: + type: object + properties: + attributes: + type: Drupal\Core\Template\Attribute + title: Attributes + description: Wrapper attributes. + html_tag: + type: string + title: HTML tag for title + # Limit the available options by using enums. + enum: + - h1 + - h2 + - h3 + - h4 + - h5 + - h6 + - span + # Provide a default value + default: h2 + title_prefix: + type: object + title: Title prefix + title_suffix: + type: object + title: Title suffix diff --git a/core/profiles/demo_umami/themes/umami/components/title/title.twig b/core/profiles/demo_umami/themes/umami/components/title/title.twig new file mode 100644 index 00000000000..0aae8674905 --- /dev/null +++ b/core/profiles/demo_umami/themes/umami/components/title/title.twig @@ -0,0 +1,5 @@ +{{ title_prefix }} +<{{ html_tag|default('h2') }}{{ attributes.addClass('umami-title') }}> + {{ label }} + +{{ title_suffix }} \ No newline at end of file diff --git a/core/profiles/demo_umami/themes/umami/css/components/content/card-common-alt/card-common-alt.css b/core/profiles/demo_umami/themes/umami/css/components/content/card-common-alt/card-common-alt.css deleted file mode 100644 index 0fe90e1b127..00000000000 --- a/core/profiles/demo_umami/themes/umami/css/components/content/card-common-alt/card-common-alt.css +++ /dev/null @@ -1,8 +0,0 @@ -/** -* @file -* This file is used to style the 'Card common alt' view mode. -*/ - -.node--view-mode-card-common-alt .node__content { - order: -1; -} diff --git a/core/profiles/demo_umami/themes/umami/css/components/content/card-common/card-common.css b/core/profiles/demo_umami/themes/umami/css/components/content/card-common/card-common.css deleted file mode 100644 index d7eb980180e..00000000000 --- a/core/profiles/demo_umami/themes/umami/css/components/content/card-common/card-common.css +++ /dev/null @@ -1,8 +0,0 @@ -/** -* @file -* This file is used to style the 'Card common' view mode. -*/ - -.node--view-mode-card-common .read-more { - margin-bottom: 1em; -} diff --git a/core/profiles/demo_umami/themes/umami/css/components/content/card/card.css b/core/profiles/demo_umami/themes/umami/css/components/content/card/card.css deleted file mode 100644 index 824e88274ca..00000000000 --- a/core/profiles/demo_umami/themes/umami/css/components/content/card/card.css +++ /dev/null @@ -1,46 +0,0 @@ -/** -* @file -* This file is used to style the 'Card' view mode. -*/ - -.view-mode-card { - display: flex; - flex-direction: column; - width: 100%; - padding: 1rem; - border: 1px solid #fcece7; -} - -.view-mode-card .node__title { - flex-grow: 1; -} - -.view-mode-card .field--name-title { - text-decoration: none; - color: #000; - font-size: 1.424rem; - font-weight: 400; -} - -.view-mode-card .node__link { - text-decoration: none; - color: #000; - background-color: inherit; -} - -.view-mode-card .node__link:focus, -.view-mode-card .node__link:hover { - text-decoration: underline; - color: #000; -} - -.view-mode-card .field--name-field-media-image img { - display: block; - width: 100%; - margin-bottom: 1.2em; -} - -.view-mode-card .label-items { - color: #5f635d; - font-size: 0.889rem; -} diff --git a/core/profiles/demo_umami/themes/umami/templates/content/node--card-common-alt.html.twig b/core/profiles/demo_umami/themes/umami/templates/content/node--card-common-alt.html.twig index 545205b64e1..444c9e69a6c 100644 --- a/core/profiles/demo_umami/themes/umami/templates/content/node--card-common-alt.html.twig +++ b/core/profiles/demo_umami/themes/umami/templates/content/node--card-common-alt.html.twig @@ -66,8 +66,35 @@ * @see template_preprocess_node() */ #} -{% extends "node--card-common.html.twig" %} +{% + set classes = [ + 'node', + 'node--type-' ~ node.bundle|clean_class, + node.isPromoted() ? 'node--promoted', + node.isSticky() ? 'node--sticky', + not node.isPublished() ? 'node--unpublished', + view_mode ? 'node--view-mode-' ~ view_mode|clean_class, + 'umami-card--alt', + ] +%} +{{ attach_library('umami/classy.node') }} -{% block libraries %} - {{ attach_library('umami/view-mode-card-common-alt') }} -{% endblock %} +{% embed "umami:card" with { attributes: attributes.addClass(classes) } %} + {% block content %} + + {{ content }} + + {% include "umami:title" with { + attributes: title_attributes.addClass('umami-card__title'), + label, + title_prefix, + title_suffix, + } only %} + {% include "umami:read-more" with { + url, + text: 'View'|t ~ ' ' ~ node.type.entity.label()|t, + a11y: label, + extra_classes: 'umami-card__read-more' + } only %} + {% endblock %} +{% endembed %} diff --git a/core/profiles/demo_umami/themes/umami/templates/content/node--card-common.html.twig b/core/profiles/demo_umami/themes/umami/templates/content/node--card-common.html.twig index 00ccfb68b5e..967e1034a01 100644 --- a/core/profiles/demo_umami/themes/umami/templates/content/node--card-common.html.twig +++ b/core/profiles/demo_umami/themes/umami/templates/content/node--card-common.html.twig @@ -73,34 +73,27 @@ node.isPromoted() ? 'node--promoted', node.isSticky() ? 'node--sticky', not node.isPublished() ? 'node--unpublished', - 'view-mode-card', view_mode ? 'node--view-mode-' ~ view_mode|clean_class, ] %} {{ attach_library('umami/classy.node') }} -{{ attach_library('umami/view-mode-card') }} -{% block libraries %} -{{ attach_library('umami/view-mode-card-common') }} -{% endblock %} - - - {{ title_prefix }} - {% if label and not page %} - - {{ label }} - - {% endif %} - {{ title_suffix }} - -
- - {% trans %}View {{ node.type.entity.label() }}{% endtrans %} - -
- - - {{ content }} - - - +{% embed "umami:card" with { attributes: attributes.addClass(classes) } %} + {% block content %} + {% include "umami:title" with { + attributes: title_attributes.addClass('umami-card__title'), + label, + title_prefix, + title_suffix, + } only %} + {% include "umami:read-more" with { + url, + text: 'View'|t ~ ' ' ~ node.type.entity.label()|t, + a11y: label, + extra_classes: 'umami-card__read-more' + } only %} + + {{ content }} + + {% endblock %} +{% endembed %} diff --git a/core/profiles/demo_umami/themes/umami/templates/content/node--card.html.twig b/core/profiles/demo_umami/themes/umami/templates/content/node--card.html.twig index 9835c2e0fe2..39acc03e42e 100644 --- a/core/profiles/demo_umami/themes/umami/templates/content/node--card.html.twig +++ b/core/profiles/demo_umami/themes/umami/templates/content/node--card.html.twig @@ -73,31 +73,27 @@ node.isPromoted() ? 'node--promoted', node.isSticky() ? 'node--sticky', not node.isPublished() ? 'node--unpublished', - 'view-mode-card', view_mode ? 'node--view-mode-' ~ view_mode|clean_class, ] %} {{ attach_library('umami/classy.node') }} -{{ attach_library('umami/view-mode-card') }} - - - {{ title_prefix }} - {% if label and not page %} - - {{ label }} - - {% endif %} - {{ title_suffix }} - - - {{ content }} - - -
- - {% trans %}View {{ node.type.entity.label() }}{% endtrans %} - -
- - +{% embed "umami:card" with { attributes: attributes.addClass(classes) } %} + {% block content %} + {% include "umami:title" with { + attributes: title_attributes.addClass('umami-card__title'), + label, + title_prefix, + title_suffix, + } only %} + + {{ content }} + + {% include "umami:read-more" with { + url, + text: 'View'|t ~ ' ' ~ node.type.entity.label()|t, + a11y: label, + extra_classes: 'umami-card__read-more' + } only %} + {% endblock %} +{% endembed %} diff --git a/core/profiles/demo_umami/themes/umami/umami.libraries.yml b/core/profiles/demo_umami/themes/umami/umami.libraries.yml index 51651fa429f..1b671f1d432 100644 --- a/core/profiles/demo_umami/themes/umami/umami.libraries.yml +++ b/core/profiles/demo_umami/themes/umami/umami.libraries.yml @@ -57,11 +57,6 @@ messages: js: js/components/messages/messages.js: {} -more-link: - css: - theme: - css/components/navigation/more-link/more-link.css: { weight: -10 } - quicklinks: css: theme: @@ -83,28 +78,12 @@ user: component: css/components/user/user.css: { weight: -10 } -view-mode-card: +demo-umami-tour: css: theme: - css/components/content/card/card.css: {} + css/components/tour/tour.theme.css: {} dependencies: - - umami/more-link - -view-mode-card-common: - css: - theme: - css/components/content/card/card.css: {} - css/components/content/card-common/card-common.css: {} - dependencies: - - umami/more-link - -view-mode-card-common-alt: - css: - theme: - css/components/content/card/card.css: {} - css/components/content/card-common-alt/card-common-alt.css: {} - dependencies: - - umami/more-link + - claro/tour-styling oneplusfourgrid_section: css: diff --git a/core/profiles/demo_umami/themes/umami/umami.theme b/core/profiles/demo_umami/themes/umami/umami.theme index 78b19feaa9f..653f6e12f05 100644 --- a/core/profiles/demo_umami/themes/umami/umami.theme +++ b/core/profiles/demo_umami/themes/umami/umami.theme @@ -39,6 +39,10 @@ function umami_preprocess_field(&$variables, $hook) { $element['#field_name'] == 'field_tags' || $element['#field_name'] == 'field_difficulty') { $variables['attributes']['class'] = 'label-items'; + + if ($element['#view_mode'] == 'card' && $element['#field_name'] == 'field_difficulty') { + $variables['attributes']['class'] = 'umami-card__label-items'; + } } } } From 1887edf2e64e415cd34f88bf35f1dfb42d65a587 Mon Sep 17 00:00:00 2001 From: Gaurav Mahlawat Date: Mon, 28 Aug 2023 08:06:33 +0530 Subject: [PATCH 2/4] Create new SDC component for Umami --- .../umami/templates/content/node--card-common-alt.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/profiles/demo_umami/themes/umami/templates/content/node--card-common-alt.html.twig b/core/profiles/demo_umami/themes/umami/templates/content/node--card-common-alt.html.twig index 444c9e69a6c..4db2b0fc9c2 100644 --- a/core/profiles/demo_umami/themes/umami/templates/content/node--card-common-alt.html.twig +++ b/core/profiles/demo_umami/themes/umami/templates/content/node--card-common-alt.html.twig @@ -79,7 +79,7 @@ %} {{ attach_library('umami/classy.node') }} -{% embed "umami:card" with { attributes: attributes.addClass(classes) } %} +{% embed "umami:card" with { attributes: attributes.addClass(classes) } only %} {% block content %} {{ content }} From 0651cef6e80113bd112e0c1f9dacfe82dd4fc8b2 Mon Sep 17 00:00:00 2001 From: iberdinsky-skilld Date: Mon, 28 Aug 2023 14:19:04 +0200 Subject: [PATCH 3/4] Added translatable readmore label(removed only) --- .../templates/content/node--card-common-alt.html.twig | 10 ++++++++-- .../templates/content/node--card-common.html.twig | 6 +++++- .../umami/templates/content/node--card.html.twig | 6 +++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/core/profiles/demo_umami/themes/umami/templates/content/node--card-common-alt.html.twig b/core/profiles/demo_umami/themes/umami/templates/content/node--card-common-alt.html.twig index 4db2b0fc9c2..d56b4899460 100644 --- a/core/profiles/demo_umami/themes/umami/templates/content/node--card-common-alt.html.twig +++ b/core/profiles/demo_umami/themes/umami/templates/content/node--card-common-alt.html.twig @@ -79,7 +79,13 @@ %} {{ attach_library('umami/classy.node') }} -{% embed "umami:card" with { attributes: attributes.addClass(classes) } only %} +{% set read_more %} +{% trans %}View {{ node.type.entity.label() }}{% endtrans %} +{% endset %} + +{% embed "umami:card" with { + attributes: attributes.addClass(classes) + } only %} {% block content %} {{ content }} @@ -92,7 +98,7 @@ } only %} {% include "umami:read-more" with { url, - text: 'View'|t ~ ' ' ~ node.type.entity.label()|t, + text: read_more, a11y: label, extra_classes: 'umami-card__read-more' } only %} diff --git a/core/profiles/demo_umami/themes/umami/templates/content/node--card-common.html.twig b/core/profiles/demo_umami/themes/umami/templates/content/node--card-common.html.twig index 967e1034a01..d1fa3ed6da9 100644 --- a/core/profiles/demo_umami/themes/umami/templates/content/node--card-common.html.twig +++ b/core/profiles/demo_umami/themes/umami/templates/content/node--card-common.html.twig @@ -78,6 +78,10 @@ %} {{ attach_library('umami/classy.node') }} +{% set read_more %} +{% trans %}View {{ node.type.entity.label() }}{% endtrans %} +{% endset %} + {% embed "umami:card" with { attributes: attributes.addClass(classes) } %} {% block content %} {% include "umami:title" with { @@ -88,7 +92,7 @@ } only %} {% include "umami:read-more" with { url, - text: 'View'|t ~ ' ' ~ node.type.entity.label()|t, + text: read_more, a11y: label, extra_classes: 'umami-card__read-more' } only %} diff --git a/core/profiles/demo_umami/themes/umami/templates/content/node--card.html.twig b/core/profiles/demo_umami/themes/umami/templates/content/node--card.html.twig index 39acc03e42e..e6088e6c9e0 100644 --- a/core/profiles/demo_umami/themes/umami/templates/content/node--card.html.twig +++ b/core/profiles/demo_umami/themes/umami/templates/content/node--card.html.twig @@ -78,6 +78,10 @@ %} {{ attach_library('umami/classy.node') }} +{% set read_more %} +{% trans %}View {{ node.type.entity.label() }}{% endtrans %} +{% endset %} + {% embed "umami:card" with { attributes: attributes.addClass(classes) } %} {% block content %} {% include "umami:title" with { @@ -91,7 +95,7 @@ {% include "umami:read-more" with { url, - text: 'View'|t ~ ' ' ~ node.type.entity.label()|t, + text: read_more, a11y: label, extra_classes: 'umami-card__read-more' } only %} From ac5ec4c27f548d14ee18dac84f040c1bbbd23110 Mon Sep 17 00:00:00 2001 From: iberdinsky-skilld Date: Sat, 2 Sep 2023 08:35:31 +0200 Subject: [PATCH 4/4] Fixed context with only --- .../content/node--card-common-alt.html.twig | 10 +++++++++- .../templates/content/node--card-common.html.twig | 12 +++++++++++- .../umami/templates/content/node--card.html.twig | 12 +++++++++++- .../demo_umami/themes/umami/umami.libraries.yml | 7 ------- 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/core/profiles/demo_umami/themes/umami/templates/content/node--card-common-alt.html.twig b/core/profiles/demo_umami/themes/umami/templates/content/node--card-common-alt.html.twig index d56b4899460..ed2ed5736f6 100644 --- a/core/profiles/demo_umami/themes/umami/templates/content/node--card-common-alt.html.twig +++ b/core/profiles/demo_umami/themes/umami/templates/content/node--card-common-alt.html.twig @@ -84,7 +84,15 @@ {% endset %} {% embed "umami:card" with { - attributes: attributes.addClass(classes) + attributes: attributes.addClass(classes), + content, + content_attributes, + label, + title_attributes, + title_prefix, + title_suffix, + read_more, + url, } only %} {% block content %} diff --git a/core/profiles/demo_umami/themes/umami/templates/content/node--card-common.html.twig b/core/profiles/demo_umami/themes/umami/templates/content/node--card-common.html.twig index d1fa3ed6da9..4e5440b7327 100644 --- a/core/profiles/demo_umami/themes/umami/templates/content/node--card-common.html.twig +++ b/core/profiles/demo_umami/themes/umami/templates/content/node--card-common.html.twig @@ -82,7 +82,17 @@ {% trans %}View {{ node.type.entity.label() }}{% endtrans %} {% endset %} -{% embed "umami:card" with { attributes: attributes.addClass(classes) } %} +{% embed "umami:card" with { + attributes: attributes.addClass(classes), + content, + content_attributes, + label, + title_attributes, + title_prefix, + title_suffix, + read_more, + url, + } only %} {% block content %} {% include "umami:title" with { attributes: title_attributes.addClass('umami-card__title'), diff --git a/core/profiles/demo_umami/themes/umami/templates/content/node--card.html.twig b/core/profiles/demo_umami/themes/umami/templates/content/node--card.html.twig index e6088e6c9e0..04d0a33f776 100644 --- a/core/profiles/demo_umami/themes/umami/templates/content/node--card.html.twig +++ b/core/profiles/demo_umami/themes/umami/templates/content/node--card.html.twig @@ -82,7 +82,17 @@ {% trans %}View {{ node.type.entity.label() }}{% endtrans %} {% endset %} -{% embed "umami:card" with { attributes: attributes.addClass(classes) } %} +{% embed "umami:card" with { + attributes: attributes.addClass(classes), + content, + content_attributes, + label, + title_attributes, + title_prefix, + title_suffix, + read_more, + url, + } only %} {% block content %} {% include "umami:title" with { attributes: title_attributes.addClass('umami-card__title'), diff --git a/core/profiles/demo_umami/themes/umami/umami.libraries.yml b/core/profiles/demo_umami/themes/umami/umami.libraries.yml index 1b671f1d432..324a0e93897 100644 --- a/core/profiles/demo_umami/themes/umami/umami.libraries.yml +++ b/core/profiles/demo_umami/themes/umami/umami.libraries.yml @@ -78,13 +78,6 @@ user: component: css/components/user/user.css: { weight: -10 } -demo-umami-tour: - css: - theme: - css/components/tour/tour.theme.css: {} - dependencies: - - claro/tour-styling - oneplusfourgrid_section: css: theme: