From 1203c69e41897c3886c0d3245c4d139a79ab64e4 Mon Sep 17 00:00:00 2001 From: barbara oliveira Date: Mon, 11 May 2026 15:05:38 +0200 Subject: [PATCH 1/5] backport banner color of CTA newsletters from black to white ##954 --- .../decidim/newsletter_templates/basic_only_text/show.erb | 6 ++++++ .../decidim/newsletter_templates/image_text_cta/show.erb | 3 +++ 2 files changed, 9 insertions(+) diff --git a/app/cells/decidim/newsletter_templates/basic_only_text/show.erb b/app/cells/decidim/newsletter_templates/basic_only_text/show.erb index 795431d9b7..2b0928ade3 100644 --- a/app/cells/decidim/newsletter_templates/basic_only_text/show.erb +++ b/app/cells/decidim/newsletter_templates/basic_only_text/show.erb @@ -1,3 +1,9 @@ + +
diff --git a/app/cells/decidim/newsletter_templates/image_text_cta/show.erb b/app/cells/decidim/newsletter_templates/image_text_cta/show.erb index dc5709d6bd..3f22bf89cf 100644 --- a/app/cells/decidim/newsletter_templates/image_text_cta/show.erb +++ b/app/cells/decidim/newsletter_templates/image_text_cta/show.erb @@ -3,6 +3,9 @@ table.button table td { background: <%= organization_primary_color %> !important } + .decidim-bar, th.decidim-bar, td.decidim-bar { + background-color: #FFFFFF !important; + } <% end %> From e54fceb4c703b553d0a791aad9036b8266dae82b Mon Sep 17 00:00:00 2001 From: barbara oliveira Date: Mon, 11 May 2026 17:32:04 +0200 Subject: [PATCH 2/5] upgrade newsletter-banner-color custom with env variable --- .../newsletter_templates/basic_only_text/show.erb | 12 +++++++----- .../newsletter_templates/image_text_cta/show.erb | 7 ++++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/cells/decidim/newsletter_templates/basic_only_text/show.erb b/app/cells/decidim/newsletter_templates/basic_only_text/show.erb index 2b0928ade3..641f3ad610 100644 --- a/app/cells/decidim/newsletter_templates/basic_only_text/show.erb +++ b/app/cells/decidim/newsletter_templates/basic_only_text/show.erb @@ -1,8 +1,10 @@ - +<% if Decidim::Env.new("DECIDIM_CUSTOM_NEWSLETTER_BAR_COLOR").present? %> + +<% end %> diff --git a/app/cells/decidim/newsletter_templates/image_text_cta/show.erb b/app/cells/decidim/newsletter_templates/image_text_cta/show.erb index 3f22bf89cf..6be54fc69d 100644 --- a/app/cells/decidim/newsletter_templates/image_text_cta/show.erb +++ b/app/cells/decidim/newsletter_templates/image_text_cta/show.erb @@ -3,8 +3,13 @@ table.button table td { background: <%= organization_primary_color %> !important } + +<% end %> + +<% if Decidim::Env.new("DECIDIM_CUSTOM_NEWSLETTER_BAR_COLOR").present? %> + <% end %> From 2ca6dddea4c9e023b573b9b3a6d428e708398645 Mon Sep 17 00:00:00 2001 From: barbara oliveira Date: Mon, 11 May 2026 17:37:23 +0200 Subject: [PATCH 3/5] docs: add DECIDIM_CUSTOM_NEWSLETTER_BAR_COLOR to env example --- .env-example | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.env-example b/.env-example index 3efc530ff4..b0f82e43b0 100644 --- a/.env-example +++ b/.env-example @@ -49,6 +49,10 @@ GEOCODER_UNITS=km # Units for geocoder results (e.g., km or m # Delay until deleted authorization's versions are deleted after the authorization creation (in days, default: 30) # DECIDIM_CLEANER_DELETE_DELETED_AUTHORIZATIONS_DATA= +# Custom color for the newsletter banner (hex value, e.g. #FFFFFF for white) +# If not set, the default Decidim color will be used +# DECIDIM_CUSTOM_NEWSLETTER_BAR_COLOR= + #= Decidim AI # DECIDIM_AI_ENABLED="true" Default: true # DECIDIM_AI_USER_SPAM_ANALYZER_ENABLED="true" Default: true From d9c1b8351da3300ca842388a93095519b448a911 Mon Sep 17 00:00:00 2001 From: barbara oliveira Date: Tue, 12 May 2026 10:28:09 +0200 Subject: [PATCH 4/5] fix CI accessibility test --- app/cells/decidim/data_consent/category.erb | 68 +++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 app/cells/decidim/data_consent/category.erb diff --git a/app/cells/decidim/data_consent/category.erb b/app/cells/decidim/data_consent/category.erb new file mode 100644 index 0000000000..bfa6c81fd0 --- /dev/null +++ b/app/cells/decidim/data_consent/category.erb @@ -0,0 +1,68 @@ +
+
+ + +
+ + <%= category[:title] %> + + + + <%= icon "arrow-down-s-line", class: "cookies__category-trigger-arrow" %> + <%= icon "arrow-up-s-line", class: "cookies__category-trigger-arrow" %> + +
+ +
+ + +
From d70a4139a25a9ef3a733e0fd2f4ba138d9383d95 Mon Sep 17 00:00:00 2001 From: barbara oliveira Date: Tue, 12 May 2026 10:29:32 +0200 Subject: [PATCH 5/5] add ignore_missing --- config/i18n-tasks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 7c796e242a..6940afe80c 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -108,6 +108,7 @@ ignore_missing: - decidim.accessibility.logo - decidim.errors.not_found.back_home - layouts.decidim.announcements.* + - layouts.decidim.data_consent.* - decidim.budgets.budget_information_modal.more_information - decidim.budgets.projects.budget_summary.vote - decidim.budgets.projects.budget_summary.cancel_order