From 35c1a9d33d50cd11e79224b8c5784862f2b30dfe Mon Sep 17 00:00:00 2001 From: Wagner Trezub Date: Tue, 31 Oct 2023 14:36:40 +0100 Subject: [PATCH 1/4] feat: added source title to single card --- .../Blocks/RssBlock/CardWithImageRssTemplate.jsx | 6 ++++++ .../Blocks/RssBlock/CardWithoutImageRssTemplate.jsx | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate.jsx b/src/components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate.jsx index 877999a5e..763a8da78 100644 --- a/src/components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate.jsx +++ b/src/components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate.jsx @@ -68,6 +68,12 @@ const CardWithImageRssTemplate = ({ )}
+ {item?.source?.length > 0 && ( + <> + {item.source} + + + )} {item?.categories?.length > 0 && item.categories[0]._ && ( <> diff --git a/src/components/ItaliaTheme/Blocks/RssBlock/CardWithoutImageRssTemplate.jsx b/src/components/ItaliaTheme/Blocks/RssBlock/CardWithoutImageRssTemplate.jsx index 16c92a130..fc9112dc2 100644 --- a/src/components/ItaliaTheme/Blocks/RssBlock/CardWithoutImageRssTemplate.jsx +++ b/src/components/ItaliaTheme/Blocks/RssBlock/CardWithoutImageRssTemplate.jsx @@ -53,6 +53,12 @@ const CardWithoutImageRssTemplate = ({
+ {item?.source?.length > 0 && ( + <> + {item.source} + + + )} {item?.categories?.length > 0 && item.categories[0]._ && ( <> From 18e3c6df27d8b7b998f83f9fd579a77903f659e5 Mon Sep 17 00:00:00 2001 From: Wagner Trezub Date: Thu, 2 Nov 2023 10:37:22 +0100 Subject: [PATCH 2/4] fix: source moved after title --- .../RssBlock/CardWithImageRssTemplate.jsx | 11 +++++------ .../RssBlock/CardWithoutImageRssTemplate.jsx | 11 +++++------ theme/ItaliaTheme/Blocks/_rssBlock.scss | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate.jsx b/src/components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate.jsx index 763a8da78..0a1d5743e 100644 --- a/src/components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate.jsx +++ b/src/components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate.jsx @@ -68,12 +68,6 @@ const CardWithImageRssTemplate = ({ )}
- {item?.source?.length > 0 && ( - <> - {item.source} - - - )} {item?.categories?.length > 0 && item.categories[0]._ && ( <> @@ -89,6 +83,11 @@ const CardWithImageRssTemplate = ({ {item.title} +
+ {item?.source?.length > 0 && ( + {item.source} + )} +
- {item?.source?.length > 0 && ( - <> - {item.source} - - - )} {item?.categories?.length > 0 && item.categories[0]._ && ( <> @@ -76,6 +70,11 @@ const CardWithoutImageRssTemplate = ({ {item.title} +
+ {item?.source?.length > 0 && ( + {item.source} + )} +
{item.contentSnippet} diff --git a/theme/ItaliaTheme/Blocks/_rssBlock.scss b/theme/ItaliaTheme/Blocks/_rssBlock.scss index b765aee26..4e2fe4ab5 100644 --- a/theme/ItaliaTheme/Blocks/_rssBlock.scss +++ b/theme/ItaliaTheme/Blocks/_rssBlock.scss @@ -1,3 +1,20 @@ +.rssBlock { + .card { + .card-body { + .source-title { + font-size: $card-category-size; + text-transform: uppercase; + color: $card-p-color; + margin-bottom: $card-category-m-bottom; + .source { + font-weight: bold; + letter-spacing: $card-category-l-spacing; + } + } + } + } +} + #text-body { .rssBlock { .row > * { From 12a91530b0bb7a67d572b6233a0347b5c138a616 Mon Sep 17 00:00:00 2001 From: Wagner Trezub Date: Thu, 2 Nov 2023 10:58:14 +0100 Subject: [PATCH 3/4] fix: div moved inside the condition and release.md --- RELEASE.md | 4 ++++ .../Blocks/RssBlock/CardWithImageRssTemplate.jsx | 8 ++++---- .../Blocks/RssBlock/CardWithoutImageRssTemplate.jsx | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index fb1bc323f..21482dce4 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -36,6 +36,10 @@ - Aggiornata nuova icona di Twitter +### Fix + +- Aggiunto titolo della sorgente per i singoli card - feed RSS + ## Versione 7.22.2 (11/10/2023) ### Fix diff --git a/src/components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate.jsx b/src/components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate.jsx index 0a1d5743e..82ff9b0cb 100644 --- a/src/components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate.jsx +++ b/src/components/ItaliaTheme/Blocks/RssBlock/CardWithImageRssTemplate.jsx @@ -83,11 +83,11 @@ const CardWithImageRssTemplate = ({ {item.title} -
- {item?.source?.length > 0 && ( + {item?.source?.length > 0 && ( +
{item.source} - )} -
+
+ )} {item.title} -
- {item?.source?.length > 0 && ( + {item?.source?.length > 0 && ( +
{item.source} - )} -
+
+ )} {item.contentSnippet} From 41c2111cbf20be6e150218bf90f03c2537c7af5a Mon Sep 17 00:00:00 2001 From: Wagner Trezub Date: Thu, 2 Nov 2023 11:25:29 +0100 Subject: [PATCH 4/4] chore: release.md --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 21482dce4..3b62270c5 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -38,7 +38,7 @@ ### Fix -- Aggiunto titolo della sorgente per i singoli card - feed RSS +- Nei template dei feed RSS ora viene mostrata la sorgente se presente. ## Versione 7.22.2 (11/10/2023)