From c74c189a31d88b7a1854dbe2a6bd9592ecab4969 Mon Sep 17 00:00:00 2001 From: Alessio Venturini <112873190+alessioventuriniAND@users.noreply.github.com> Date: Fri, 30 Aug 2024 09:37:28 +0100 Subject: [PATCH 1/7] fixed issues (#3324) --- src/components/card/_macro.njk | 2 +- src/components/hero/_macro.njk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/card/_macro.njk b/src/components/card/_macro.njk index b1eb3dd4bc..72868b4a86 100644 --- a/src/components/card/_macro.njk +++ b/src/components/card/_macro.njk @@ -2,7 +2,7 @@ {% set headingLevel = params.headingLevel | default(2) | string %} {% set openingHeadingTag = "" %} - {% set placeholderSrcset = (params.image.placeholderURL if params.image.placeholderURL) + "/img/small/placeholder-card.png 1x, " + (params.image.placeholderURL if params.image.placeholderURL else "") + "/img/large/placeholder-card.png 2x" %} + {% set placeholderSrcset = (params.image.placeholderURL if params.image.placeholderURL else "") + "/img/small/placeholder-card.png 1x, " + (params.image.placeholderURL if params.image.placeholderURL else "") + "/img/large/placeholder-card.png 2x" %}
diff --git a/src/components/hero/_macro.njk b/src/components/hero/_macro.njk index 7cee7fc917..84d7a33102 100644 --- a/src/components/hero/_macro.njk +++ b/src/components/hero/_macro.njk @@ -21,7 +21,7 @@ {% if params.button %} {% from "components/button/_macro.njk" import onsButton %} - {% set btnClasses = params.button.classes if params.button.classes %} + {% set btnClasses = params.button.classes if params.button.classes else '' %} {% if params.variants and 'dark' in params.variants %} {% set btnClasses = btnClasses + ' ons-btn--ghost' %} {% endif %} From 650f48a9bb14c2ff5079e4418f6c95f1e0c1c899 Mon Sep 17 00:00:00 2001 From: SriHV <123635670+SriHV@users.noreply.github.com> Date: Fri, 30 Aug 2024 10:23:15 +0100 Subject: [PATCH 2/7] Updated color of check icon for summary variant in list component to green (#3318) * changes as per the ticket * Update src/components/list/_list.scss Co-authored-by: rmccar <42928680+rmccar@users.noreply.github.com> * Changes in list macro * changes as per tech session * snapshot update --------- Co-authored-by: rmccar <42928680+rmccar@users.noreply.github.com> Co-authored-by: Alessio Venturini <112873190+alessioventuriniAND@users.noreply.github.com> --- __snapshots__/layout/_template.spec.js.snap | 4 ---- src/components/list/_list.scss | 6 +++++ src/components/list/_macro.njk | 11 ++++++--- src/components/list/_macro.spec.js | 26 +++++++++++++++++++++ 4 files changed, 40 insertions(+), 7 deletions(-) diff --git a/__snapshots__/layout/_template.spec.js.snap b/__snapshots__/layout/_template.spec.js.snap index ba70038df6..3fa2ab0f53 100644 --- a/__snapshots__/layout/_template.spec.js.snap +++ b/__snapshots__/layout/_template.spec.js.snap @@ -1395,7 +1395,6 @@ exports[`base page template matches the full configuration snapshot 1`] = ` -