From d262b559bb0e4ad5ceda3acffd2223a26d09b78b Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@drevops.com>
Date: Mon, 6 Nov 2023 16:31:55 +1100
Subject: [PATCH] Fixed Twig coding standards.

---
 .twig_cs.php                                  | 15 ++++++-
 .../00-base/colors/colors.stories.twig        |  2 +-
 .../components/00-base/icon/icon.twig         |  2 +-
 .../components/01-atoms/button/button.twig    |  4 +-
 .../components/01-atoms/chip/chip.twig        |  2 +-
 .../components/01-atoms/link/link.twig        |  2 +-
 .../components/01-atoms/tag/tag.twig          |  2 +-
 .../02-molecules/attachment/attachment.twig   |  2 +-
 .../02-molecules/breadcrumb/breadcrumb.twig   |  6 +--
 .../02-molecules/callout/callout.twig         |  2 +-
 .../form-element/form-element.twig            | 11 +++--
 .../group-filter/group-filter.twig            |  6 +--
 .../components/02-molecules/logo/logo.twig    |  2 +-
 .../navigation-card/navigation-card.twig      |  4 +-
 .../publication-card/publication-card.twig    |  2 +-
 .../components/02-molecules/quote/quote.twig  |  4 +-
 .../service-card/service-card.twig            |  4 +-
 .../single-filter/single-filter.twig          |  4 +-
 .../02-molecules/tag-list/tag-list.twig       |  4 +-
 .../components/03-organisms/alert/alert.twig  |  2 +-
 .../03-organisms/banner/banner.twig           |  4 +-
 .../03-organisms/campaign/campaign.twig       |  4 +-
 .../03-organisms/header/header.twig           |  2 +-
 .../03-organisms/message/message.twig         |  2 +-
 .../03-organisms/navigation/navigation.twig   |  4 +-
 .../components/03-organisms/slider/slide.twig |  4 +-
 .../social-links/social-links.twig            |  2 +-
 ...-civictheme-secondary-navigation.html.twig |  2 +-
 .../templates/block/block.html.twig           |  6 +--
 .../field/field--field-c-n-date.html.twig     |  6 ---
 .../templates/form/checkboxes.html.twig       |  2 +-
 .../templates/form/radios.html.twig           |  3 +-
 .../templates/layout/html.html.twig           | 42 +++++++++----------
 .../templates/layout/page.html.twig           |  4 +-
 .../paragraph--civictheme-iframe.html.twig    |  2 +-
 .../templates/views/views-view.html.twig      |  2 +-
 36 files changed, 86 insertions(+), 87 deletions(-)

diff --git a/.twig_cs.php b/.twig_cs.php
index 2097644a5..15cc29b95 100644
--- a/.twig_cs.php
+++ b/.twig_cs.php
@@ -4,11 +4,22 @@
 
 use FriendsOfTwig\Twigcs;
 
+// Exclude directories with compiled components.
+$excluded = [
+  '.components-civictheme',
+  'components_combined',
+];
+
+// Filter-out stories templates
+$filter = function (\SplFileInfo $fileInfo) {
+  return !str_contains($fileInfo->getFilename(), 'stories');
+};
+
 return Twigcs\Config\Config::create()
   ->setName('custom-config')
   ->setSeverity('error')
   ->setReporter('console')
   ->setRuleSet(Twigcs\Ruleset\Official::class)
   ->addFinder(Twigcs\Finder\TemplateFinder::create()->in(__DIR__ . '/web/modules/custom'))
-  ->addFinder(Twigcs\Finder\TemplateFinder::create()->in(__DIR__ . '/web/themes/contrib/civictheme'))
-  ->addFinder(Twigcs\Finder\TemplateFinder::create()->in(__DIR__ . '/web/themes/custom'));
+  ->addFinder(Twigcs\Finder\TemplateFinder::create()->in(__DIR__ . '/web/themes/contrib/civictheme')->exclude($excluded)->filter($filter))
+  ->addFinder(Twigcs\Finder\TemplateFinder::create()->in(__DIR__ . '/web/themes/custom')->exclude($excluded)->filter($filter));
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/00-base/colors/colors.stories.twig b/web/themes/contrib/civictheme/civictheme_library/components/00-base/colors/colors.stories.twig
index 68a1d9d4a..86d8a5dc0 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/00-base/colors/colors.stories.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/00-base/colors/colors.stories.twig
@@ -21,7 +21,7 @@
             <div class="example-container__content story-colors-wrapper story-wrapper-size--large">
               {% for color_name, color in colors %}
                 <div class="story-color-{{ theme }}--{{ color_name }}">
-                  <span class="story-color-element" title="{{ color_name }}"></span><span class="story-color-text" title="{{ color_name }}">{{ color_name|capitalize|replace({'-':' '}) }}</span>
+                  <span class="story-color-element" title="{{ color_name }}"></span><span class="story-color-text" title="{{ color_name }}">{{ color_name|capitalize|replace({'-': ' '}) }}</span>
                 </div>
               {% endfor %}
             </div>
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/00-base/icon/icon.twig b/web/themes/contrib/civictheme/civictheme_library/components/00-base/icon/icon.twig
index 7405e713d..b22d4bef4 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/00-base/icon/icon.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/00-base/icon/icon.twig
@@ -18,7 +18,7 @@
 {% if symbol is not empty %}
   {% set source = source(assets_dir ~ '/icons/' ~ symbol ~ '.svg', true) %}
   {% if source is not empty %}
-    {% set attributes = 'class="ct-icon ' ~ (size ? 'ct-icon--size-' ~ size : '') ~ ' ' ~ modifier_class|default('') ~ '" aria-hidden="true" role="img" ' ~ (alt is defined ? 'alt="' ~ alt  ~ '"' : '') ~ attributes|default('') %}
+    {% set attributes = 'class="ct-icon ' ~ (size ? 'ct-icon--size-' ~ size : '') ~ ' ' ~ modifier_class|default('') ~ '" aria-hidden="true" role="img" ' ~ (alt is defined ? 'alt="' ~ alt ~ '"' : '') ~ attributes|default('') %}
     {{ source|replace({'<svg ': '<svg ' ~ attributes ~ ' '})|raw }}
   {% endif %}
 {% endif %}
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/01-atoms/button/button.twig b/web/themes/contrib/civictheme/civictheme_library/components/01-atoms/button/button.twig
index 4ddbf11da..6da3f835e 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/01-atoms/button/button.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/01-atoms/button/button.twig
@@ -28,7 +28,7 @@
 {% set type_class = type ? 'ct-button--%s'|format(type) : '' %}
 {% set kind_class = kind ? 'ct-button--%s'|format(kind) : '' %}
 {% set size_class = 'ct-button--%s'|format(size) %}
-{% set dismiss_class =  is_dismissable ? 'ct-button--dismiss' : '' %}
+{% set dismiss_class = is_dismissable ? 'ct-button--dismiss' : '' %}
 {% set is_external = is_external ? 'ct-button--external' : '' %}
 {% set theme_class = 'ct-theme-%s'|format(theme|default('light')) %}
 {% set modifier_class = '%s %s %s %s %s %s %s'|format(theme_class, type_class, kind_class, size_class, dismiss_class, is_external, modifier_class|default('')) %}
@@ -93,7 +93,7 @@
     type="{{ kind }}"
     class="ct-button {{ modifier_class }}"
     data-component-name="button"
-    value="{{ (is_raw_text ? text|raw : text) |trim }}"
+    value="{{ (is_raw_text ? text|raw : text)|trim }}"
     {% if is_disabled %}disabled="disabled" aria-disabled="true"{% endif %}
     {% if attributes is not empty %}{{ attributes|raw }}{% endif %}
   />
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/01-atoms/chip/chip.twig b/web/themes/contrib/civictheme/civictheme_library/components/01-atoms/chip/chip.twig
index e3af3e1b8..d9b4c44fd 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/01-atoms/chip/chip.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/01-atoms/chip/chip.twig
@@ -20,7 +20,7 @@
 {% set kind_class = kind ? 'ct-chip--%s'|format(kind) : '' %}
 {% set size = size in ['large', 'regular', 'small'] ? size : 'regular' %}
 {% set size_class = 'ct-chip--%s'|format(size) %}
-{% set selected_class =  is_selected ? 'active' : '' %}
+{% set selected_class = is_selected ? 'active' : '' %}
 {% set multiple_class = is_multiple ? 'ct-chip--multiple' : '' %}
 {% set theme_class = 'ct-theme-%s'|format(theme|default('light')) %}
 {% set modifier_class = '%s %s %s %s %s %s'|format(theme_class, kind_class, size_class, selected_class, multiple_class, modifier_class|default('')) %}
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/01-atoms/link/link.twig b/web/themes/contrib/civictheme/civictheme_library/components/01-atoms/link/link.twig
index aa48e2045..8298f99ef 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/01-atoms/link/link.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/01-atoms/link/link.twig
@@ -20,7 +20,7 @@
 #}
 
 {% set text = text|default('') %}
-{% set only_icon_class =  icon is not empty and text is empty ? 'ct-link--only-icon' : '' %}
+{% set only_icon_class = icon is not empty and text is empty ? 'ct-link--only-icon' : '' %}
 {% set icon_placement = icon_placement in ['before', 'after'] ? icon_placement : 'after' %}
 {% set is_external_class = is_external ? 'ct-link--external' : '' %}
 {% set is_active_class = is_active ? 'ct-link--active' : '' %}
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/01-atoms/tag/tag.twig b/web/themes/contrib/civictheme/civictheme_library/components/01-atoms/tag/tag.twig
index 4caef7c0a..dbfec7c74 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/01-atoms/tag/tag.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/01-atoms/tag/tag.twig
@@ -22,7 +22,7 @@
 {% set icon_class = icon is not empty ? 'ct-tag--with-icon' : '' %}
 {% set icon_placement = icon_placement in ['before', 'after'] ? icon_placement : 'after' %}
 {% set icon_placement_class = icon ? 'ct-tag--icon-%s'|format(icon_placement|default('before')) : '' %}
-{% set is_external = is_external ? 'ct-tag--external': '' %}
+{% set is_external = is_external ? 'ct-tag--external' : '' %}
 {% set theme_class = 'ct-theme-%s'|format(theme|default('light')) %}
 {% set modifier_class = '%s %s %s %s %s %s'|format(theme_class, type_class, icon_class, icon_placement_class, is_external, modifier_class|default('')) %}
 
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/attachment/attachment.twig b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/attachment/attachment.twig
index b6e8622d9..ec5515fc9 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/attachment/attachment.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/attachment/attachment.twig
@@ -70,7 +70,7 @@
 
             {% block links %}
               {% set link_items = [] %}
-              {% for k, file in files %}
+              {% for file in files %}
                 {%- set link %}
                   {% include '@base/icon/icon.twig' with {
                     symbol: file.icon ? file.icon : 'download-file',
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/breadcrumb/breadcrumb.twig b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/breadcrumb/breadcrumb.twig
index 5ffb1fb31..c9eb5420d 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/breadcrumb/breadcrumb.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/breadcrumb/breadcrumb.twig
@@ -24,7 +24,7 @@
   <nav class="ct-breadcrumb {{ modifier_class }}" aria-label="breadcrumb" {% if attributes is not empty %}{{ attributes|raw }}{% endif %}>
     {% set link_items = [] %}
 
-    {% for key, link in links %}
+    {% for link in links %}
       {% set link_item %}
         {% set link = {
           text: link.text,
@@ -42,7 +42,7 @@
         {% endif %}
       {% endset %}
 
-      {% set link_items = link_items|merge([ link_item ]) %}
+      {% set link_items = link_items|merge([link_item]) %}
 
       {% if loop.index < links_count %}
         {% set link_item %}
@@ -51,7 +51,7 @@
             modifier_class: 'ct-breadcrumb__links__separator',
           } only %}
         {% endset %}
-        {% set link_items = link_items|merge([ link_item ]) %}
+        {% set link_items = link_items|merge([link_item]) %}
       {% endif %}
 
       {% if loop.index == links_count - 1 %}
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/callout/callout.twig b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/callout/callout.twig
index 31939dc0c..5cfc26290 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/callout/callout.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/callout/callout.twig
@@ -63,7 +63,7 @@
 
           {% block links %}
             {% set link_items = [] %}
-            {% for k, link in links %}
+            {% for link in links %}
               {%- set link %}
                 {% include '@atoms/button/button.twig' with {
                   theme: theme,
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/form-element/form-element.twig b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/form-element/form-element.twig
index a3596411d..95702c4fe 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/form-element/form-element.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/form-element/form-element.twig
@@ -15,18 +15,17 @@
  * - description_modifier_class: [string] Additional classes for description.
  * - attributes: [string] Additional attributes.
  * - modifier_class: [string] Additional classes.
- *
  * - id: [string] DOM Id.
  */
 #}
 
 {% set theme_class = 'ct-theme-%s'|format(theme|default('light')) %}
-{% set type_class =  type is not empty ? 'ct-form-element--%s'|format(type) : '' %}
-{% set name_class = name is not empty ?  'ct-form-element--%s'|format(name) : '' %}
+{% set type_class = type is not empty ? 'ct-form-element--%s'|format(type) : '' %}
+{% set name_class = name is not empty ? 'ct-form-element--%s'|format(name) : '' %}
 {% set label_class = label_display not in ['after', 'before'] ? 'ct-form-element--no-label' : 'ct-form-element--label--%s'|format(title_display) %}
 {% set description_class = description_display not in ['after', 'before'] ? 'ct-form-element--no-description' : 'ct-form-element--label--%s'|format(description_display) %}
-{% set disabled_class =  disabled == 'disabled' ? 'ct-form-element--form-disabled' : '' %}
-{% set error_class =  errors is not empty ? 'ct-form-element--error' : '' %}
+{% set disabled_class = disabled == 'disabled' ? 'ct-form-element--form-disabled' : '' %}
+{% set error_class = errors is not empty ? 'ct-form-element--error' : '' %}
 {% set modifier_class = '%s %s %s %s %s %s %s %s'|format(theme_class, type_class, name_class, label_class, description_class, disabled_class, error_class, modifier_class|default('')) %}
 
 {% set description_modifier_class = '%s %s'|format(description_visibility_class|default(''), description_display_class|default('')) %}
@@ -49,7 +48,7 @@
     {% include '@atoms/field-description/field-description.twig' with {
       theme: theme,
       content: description,
-      modifier_class: 'ct-form-element__description',
+      modifier_class: 'ct-form-element__description ' ~ description_modifier_class,
     } only %}
   {% endif %}
 
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/group-filter/group-filter.twig b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/group-filter/group-filter.twig
index 4ca4b21c6..840c91fde 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/group-filter/group-filter.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/group-filter/group-filter.twig
@@ -43,9 +43,9 @@
           {% endblock %}
 
           {% block filters %}
-            {% set group = 'ct-group-filter--group-' ~ random(1000,9999) %}
+            {% set group = 'ct-group-filter--group-' ~ random(1000, 9999) %}
             {% set filters_items = [] %}
-            {% for key, filter in filters %}
+            {% for filter in filters %}
               {% set filters_item %}
                 {% include '@atoms/popover/popover.twig' with {
                   theme: theme,
@@ -56,7 +56,7 @@
                   group: group,
                 } only %}
               {% endset %}
-              {% set filters_items = filters_items|merge([ filters_item ]) %}
+              {% set filters_items = filters_items|merge([filters_item]) %}
             {% endfor %}
 
             {% if form_attributes is not empty %}
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/logo/logo.twig b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/logo/logo.twig
index 71dce72fe..b62a461a7 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/logo/logo.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/logo/logo.twig
@@ -26,7 +26,7 @@
 {% set type = type in ['default', 'inline', 'stacked', 'inline-stacked'] ? type : 'default' %}
 {% set type_class = 'ct-logo--%s'|format(type|default('default')) %}
 {% set theme_class = 'ct-theme-%s'|format(theme|default('light')) %}
-{% set modifier_class = '%s %s %s'|format(theme_class, type_class,  modifier_class|default('')) %}
+{% set modifier_class = '%s %s %s'|format(theme_class, type_class, modifier_class|default('')) %}
 
 {% if logos is not empty %}
   {% if url is not empty %}
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/navigation-card/navigation-card.twig b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/navigation-card/navigation-card.twig
index 7effee78c..acaebced0 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/navigation-card/navigation-card.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/navigation-card/navigation-card.twig
@@ -27,9 +27,9 @@
 #}
 
 {% set with_image = image.url is not empty %}
-{% set with_image_class = with_image ? 'ct-navigation-card--with-image': '' %}
+{% set with_image_class = with_image ? 'ct-navigation-card--with-image' : '' %}
 {% set with_link = link is not empty and link.url is defined and link.url is not empty %}
-{% set with_link_class = with_link ? 'ct-navigation-card--with-link': '' %}
+{% set with_link_class = with_link ? 'ct-navigation-card--with-link' : '' %}
 {% set image_as_icon_class = image_as_icon ? 'ct-navigation-card--image-as-icon' : '' %}
 {% set theme_class = 'ct-theme-%s'|format(theme|default('light')) %}
 {% set modifier_class = '%s %s %s %s %s'|format(theme_class, with_image_class, with_link_class, image_as_icon_class, modifier_class|default('')) %}
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/publication-card/publication-card.twig b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/publication-card/publication-card.twig
index d5f62136b..dbd88a5e8 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/publication-card/publication-card.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/publication-card/publication-card.twig
@@ -28,7 +28,7 @@
 #}
 
 {% set with_image = image.url is not empty %}
-{% set with_image_class = with_image ? 'ct-publication-card--with-image': '' %}
+{% set with_image_class = with_image ? 'ct-publication-card--with-image' : '' %}
 {% set theme_class = 'ct-theme-%s'|format(theme|default('light')) %}
 {% set modifier_class = '%s %s %s %s'|format(theme_class, with_image_class, with_link_class, modifier_class|default('')) %}
 
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/quote/quote.twig b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/quote/quote.twig
index ce183b71f..ec3c98a5e 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/quote/quote.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/quote/quote.twig
@@ -18,7 +18,7 @@
 {% set modifier_class = '%s %s %s'|format(theme_class, vertical_spacing_class, modifier_class|default('')) %}
 
 {% if content is not empty %}
-  <figure class="ct-quote {{ modifier_class }}" {% if attributes is not empty %}{{ attributes|raw }}{% endif%}>
+  <figure class="ct-quote {{ modifier_class }}" {% if attributes is not empty %}{{ attributes|raw }}{% endif %}>
     <blockquote class="ct-quote__content">
       {{ content }}
     </blockquote>
@@ -26,6 +26,6 @@
       <figcaption class="ct-quote__author">
         {{ author }}
       </figcaption>
-    {% endif  -%}
+    {% endif -%}
   </figure>
 {% endif %}
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/service-card/service-card.twig b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/service-card/service-card.twig
index 5d76f44e8..e179a37a5 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/service-card/service-card.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/service-card/service-card.twig
@@ -46,7 +46,7 @@
       {% block links %}
         {% if links is not empty %}
           {% set list_items = [] %}
-          {% for key, link in links %}
+          {% for link in links %}
             {% if link.text is not empty %}
               {% set list_item %}
                 {% include '@atoms/link/link.twig' with {
@@ -57,7 +57,7 @@
                   is_external: link.is_external is defined ? link.is_external : false,
                 } only %}
               {% endset %}
-              {% set list_items = list_items|merge([ list_item ]) %}
+              {% set list_items = list_items|merge([list_item]) %}
             {% endif %}
           {% endfor %}
           {% include '@base/item-list/item-list.twig' with {
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/single-filter/single-filter.twig b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/single-filter/single-filter.twig
index 16c58825f..a2b3904db 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/single-filter/single-filter.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/single-filter/single-filter.twig
@@ -48,7 +48,7 @@
                 {% if item.text is not empty %}
                   {% set item_attributes = item.attributes is defined and item.attributes is not empty ? item.attributes : '' %}
                   {% set item_name = item.name is defined ? item.name : (is_multiple ? 'single-filter-' ~ loop.index : 'single-filter') %}
-                  {% set item_attributes = 'name' not in item_attributes ? item_attributes ~ ' name="' ~  item_name ~ '"' : item_attributes %}
+                  {% set item_attributes = 'name' not in item_attributes ? item_attributes ~ ' name="' ~ item_name ~ '"' : item_attributes %}
                   {% include '@atoms/chip/chip.twig' with {
                     theme: theme,
                     kind: 'input',
@@ -60,7 +60,7 @@
                   } only %}
                 {% endif %}
               {% endset %}
-              {% set filter_items = filter_items|merge([ filter_item ]) %}
+              {% set filter_items = filter_items|merge([filter_item]) %}
             {% endfor %}
 
             {% if form_attributes is not empty %}
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/tag-list/tag-list.twig b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/tag-list/tag-list.twig
index eed5607e8..75b3322b8 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/tag-list/tag-list.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/02-molecules/tag-list/tag-list.twig
@@ -31,14 +31,14 @@
     {% block content %}
       {% if tags %}
         {% set tag_items = [] %}
-        {% for key, tag in tags %}
+        {% for tag in tags %}
           {% set tag_item %}
             {% include '@atoms/tag/tag.twig' with {
               theme: theme,
               content: tag,
             } only %}
           {% endset %}
-          {% set tag_items = tag_items|merge([ tag_item ]) %}
+          {% set tag_items = tag_items|merge([tag_item]) %}
         {% endfor %}
         {% include '@base/item-list/item-list.twig' with {
           items: tag_items,
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/alert/alert.twig b/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/alert/alert.twig
index 63da66459..f32e606d4 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/alert/alert.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/alert/alert.twig
@@ -18,7 +18,7 @@
 {% set theme_class = 'ct-theme-%s'|format(theme|default('light')) %}
 {% set type = type|default('information') %}
 {% set type_class = 'ct-alert--%s'|format(type|default('information')) %}
-{% set modifier_class = '%s %s %s'|format(theme_class, type_class, modifier_class | default('')) %}
+{% set modifier_class = '%s %s %s'|format(theme_class, type_class, modifier_class|default('')) %}
 
 {% set icons = {
   information: 'information-mark',
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/banner/banner.twig b/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/banner/banner.twig
index 5ee82a09f..754f098ed 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/banner/banner.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/banner/banner.twig
@@ -28,7 +28,7 @@
  */
 #}
 
-{% set is_decorative_class = is_decorative ? 'ct-banner--decorative': '' %}
+{% set is_decorative_class = is_decorative ? 'ct-banner--decorative' : '' %}
 {% set theme_class = 'ct-theme-%s'|format(theme|default('light')) %}
 {% set modifier_class = '%s %s %s'|format(theme_class, is_decorative_class, modifier_class|default('')) %}
 
@@ -155,7 +155,7 @@
             {% include '@atoms/image/image.twig' with {
               theme: theme,
               url: featured_image.url,
-              alt:  featured_image.alt,
+              alt: featured_image.alt,
               modifier_class: 'ct-banner__featured-image',
             } only %}
           </div>
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/campaign/campaign.twig b/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/campaign/campaign.twig
index 16f169baa..96dbdab05 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/campaign/campaign.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/campaign/campaign.twig
@@ -95,7 +95,7 @@
                 {% block links %}
                   {% if links is not empty %}
                     {% set link_items = [] %}
-                    {% for key, link in links %}
+                    {% for link in links %}
                       {% set link_item %}
                         {% include '@atoms/button/button.twig' with {
                           theme: theme,
@@ -106,7 +106,7 @@
                           is_new_window: link.is_new_window,
                         } only %}
                       {% endset %}
-                      {% set link_items = link_items|merge([ link_item ]) %}
+                      {% set link_items = link_items|merge([link_item]) %}
                     {% endfor %}
 
                     {% include '@base/item-list/item-list.twig' with {
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/header/header.twig b/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/header/header.twig
index 3ae13ab99..fa4ed1b75 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/header/header.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/header/header.twig
@@ -19,7 +19,7 @@
 {% set theme_class = 'ct-theme-%s'|format(theme|default('light')) %}
 {% set modifier_class = '%s %s'|format(theme_class, modifier_class|default('')) %}
 
-{% if content_top1 is not empty or content_top2 is not empty or content_top3 is not empty or content_middle1 is not empty or content_middle2 is not empty or content_middle3 is not empty  or content_bottom1 is not empty %}
+{% if content_top1 is not empty or content_top2 is not empty or content_top3 is not empty or content_middle1 is not empty or content_middle2 is not empty or content_middle3 is not empty or content_bottom1 is not empty %}
   <header class="ct-header {{ modifier_class }}" role="banner">
 
     {% if content_top1 is not empty or content_top2 is not empty or content_top3 is not empty %}
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/message/message.twig b/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/message/message.twig
index a91151f03..e517fa682 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/message/message.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/message/message.twig
@@ -14,7 +14,7 @@
 {% set type = type|default('information') %}
 {% set type_class = 'ct-message--%s'|format(type) %}
 {% set theme_class = 'ct-theme-%s'|format(theme|default('light')) %}
-{% set modifier_class = '%s %s %s'|format(theme_class, type_class, modifier_class | default('')) %}
+{% set modifier_class = '%s %s %s'|format(theme_class, type_class, modifier_class|default('')) %}
 
 {% set icons = {
   information: 'information-mark',
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/navigation/navigation.twig b/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/navigation/navigation.twig
index 7be40ee44..e381d9fee 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/navigation/navigation.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/navigation/navigation.twig
@@ -35,13 +35,13 @@
           {% set item_dropdown_columns_fill_class = dropdown_columns_fill ? 'ct-navigation__dropdown-columns--fill' : '' %}
           {% set item_modifier_class = 'ct-navigation__has-dropdown %s %s'|format(item_dropdown_columns_class, item_dropdown_columns_fill_class) %}
           {# Update item with attributes and classes. #}
-          {% set new_item = items[key]|merge({'attributes': item_attributes, 'modifier_class': item_modifier_class }) %}
+          {% set new_item = items[key]|merge({'attributes': item_attributes, 'modifier_class': item_modifier_class}) %}
           {% set items = items|merge({(key): new_item}) %}
         {% else %}
           {# Item classes to style dynamically. #}
           {% set item_modifier_class = 'ct-navigation__has-dropdown' %}
           {# Update item with attributes and classes. #}
-          {% set new_item = items[key]|merge({'attributes': item_attributes, 'modifier_class': item_modifier_class }) %}
+          {% set new_item = items[key]|merge({'attributes': item_attributes, 'modifier_class': item_modifier_class}) %}
           {% set items = items|merge({(key): new_item}) %}
         {% endif %}
       {% endif %}
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/slider/slide.twig b/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/slider/slide.twig
index dc8f03f6e..ef8a1a7ca 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/slider/slide.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/slider/slide.twig
@@ -106,7 +106,7 @@
         {% block links %}
           {% if links is not empty %}
             {% set link_items = [] %}
-            {% for key, link in links %}
+            {% for link in links %}
               {% set link_item %}
                 {% include '@atoms/button/button.twig' with {
                   theme: theme,
@@ -118,7 +118,7 @@
                   modifier_class: 'ct-slide__links__link',
                 } only %}
               {% endset %}
-              {% set link_items = link_items|merge([ link_item ]) %}
+              {% set link_items = link_items|merge([link_item]) %}
             {% endfor %}
 
             {% include '@base/item-list/item-list.twig' with {
diff --git a/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/social-links/social-links.twig b/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/social-links/social-links.twig
index a7477213e..bcde0d9dd 100644
--- a/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/social-links/social-links.twig
+++ b/web/themes/contrib/civictheme/civictheme_library/components/03-organisms/social-links/social-links.twig
@@ -25,7 +25,7 @@
 
     {% block items %}
       {% set items_rendered = [] %}
-      {% for k, item in items %}
+      {% for item in items %}
         {%- set item_rendered %}
           {% include '@atoms/button/button.twig' with {
             theme: theme,
diff --git a/web/themes/contrib/civictheme/templates/block/block--menu-block--civictheme-secondary-navigation.html.twig b/web/themes/contrib/civictheme/templates/block/block--menu-block--civictheme-secondary-navigation.html.twig
index 4a8f8689f..9077b2b16 100644
--- a/web/themes/contrib/civictheme/templates/block/block--menu-block--civictheme-secondary-navigation.html.twig
+++ b/web/themes/contrib/civictheme/templates/block/block--menu-block--civictheme-secondary-navigation.html.twig
@@ -5,7 +5,7 @@
  */
 #}
 {% if in_sidebar %}
-  {% include '@organisms/side-navigation/side-navigation.twig'  with {
+  {% include '@organisms/side-navigation/side-navigation.twig' with {
     theme,
     items,
     modifier_class: 'ct-secondary-navigation',
diff --git a/web/themes/contrib/civictheme/templates/block/block.html.twig b/web/themes/contrib/civictheme/templates/block/block.html.twig
index 1657b73c1..c55bec835 100644
--- a/web/themes/contrib/civictheme/templates/block/block.html.twig
+++ b/web/themes/contrib/civictheme/templates/block/block.html.twig
@@ -4,13 +4,11 @@
  * CivicTheme implementation to display a block.
  */
 #}
-{%
-  set classes = [
+{% set classes = [
   'block',
   'block-' ~ configuration.provider|clean_class,
   'block-' ~ plugin_id|clean_class,
-]
-%}
+] %}
 <div{{ attributes.addClass(classes) }}>
   {{ title_prefix }}
   {% if label %}
diff --git a/web/themes/contrib/civictheme/templates/field/field--field-c-n-date.html.twig b/web/themes/contrib/civictheme/templates/field/field--field-c-n-date.html.twig
index def268fc3..ad90820ac 100644
--- a/web/themes/contrib/civictheme/templates/field/field--field-c-n-date.html.twig
+++ b/web/themes/contrib/civictheme/templates/field/field--field-c-n-date.html.twig
@@ -4,12 +4,6 @@
  * CivicTheme implementation to display a Date field.
  */
 #}
-{%
-  set title_classes = [
-  label_display == 'visually_hidden' ? 'visually-hidden',
-]
-%}
-
 {% if label_hidden %}
   {% if multiple %}
     <div{{ attributes }}>
diff --git a/web/themes/contrib/civictheme/templates/form/checkboxes.html.twig b/web/themes/contrib/civictheme/templates/form/checkboxes.html.twig
index 7b863c51b..8cef108bc 100644
--- a/web/themes/contrib/civictheme/templates/form/checkboxes.html.twig
+++ b/web/themes/contrib/civictheme/templates/form/checkboxes.html.twig
@@ -5,7 +5,7 @@
  */
 #}
 {# Manually adding in fieldset as we need to remove preRender form markup for civictheme filter system. #}
-{% embed  '@atoms/fieldset/fieldset.twig' with {
+{% embed '@atoms/fieldset/fieldset.twig' with {
   legend: fieldset_legend,
   legend_span: fieldset_legend_span,
   modifier_class: modifier_class,
diff --git a/web/themes/contrib/civictheme/templates/form/radios.html.twig b/web/themes/contrib/civictheme/templates/form/radios.html.twig
index 5f2d71822..2b5163035 100644
--- a/web/themes/contrib/civictheme/templates/form/radios.html.twig
+++ b/web/themes/contrib/civictheme/templates/form/radios.html.twig
@@ -1,12 +1,11 @@
 {#
-{#
 /**
  * @file
  * CivicTheme implementation to display a 'radios' form element.
  */
 #}
 {# Manually adding in fieldset as we need to remove preRender form markup for civictheme filter system. #}
-{% embed  '@atoms/fieldset/fieldset.twig' with {
+{% embed '@atoms/fieldset/fieldset.twig' with {
   legend: fieldset_legend,
   legend_span: fieldset_legend_span,
   modifier_class: modifier_class,
diff --git a/web/themes/contrib/civictheme/templates/layout/html.html.twig b/web/themes/contrib/civictheme/templates/layout/html.html.twig
index 72adca92e..e3a0c6999 100644
--- a/web/themes/contrib/civictheme/templates/layout/html.html.twig
+++ b/web/themes/contrib/civictheme/templates/layout/html.html.twig
@@ -4,32 +4,30 @@
  * CivicTheme implementation to display a single Drupal page.
  */
 #}
-{%
-    set body_classes = [
-    logged_in ? 'user-logged-in',
-    not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class,
-    node_type ? 'page-node-type-' ~ node_type|clean_class,
-    db_offline ? 'db-offline',
-]
-%}
+{% set body_classes = [
+  logged_in ? 'user-logged-in',
+  not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class,
+  node_type ? 'page-node-type-' ~ node_type|clean_class,
+  db_offline ? 'db-offline',
+] %}
 <!DOCTYPE html>
 <html{{ html_attributes }}>
-  <head>
-    <head-placeholder token="{{ placeholder_token }}">
+<head>
+  <head-placeholder token="{{ placeholder_token }}">
     <title>{{ head_title|safe_join(' | ') }}</title>
     <css-placeholder token="{{ placeholder_token }}">
-    <js-placeholder token="{{ placeholder_token }}">
-  </head>
-  <body{{ attributes.addClass(body_classes) }}>
+      <js-placeholder token="{{ placeholder_token }}">
+</head>
+<body{{ attributes.addClass(body_classes) }}>
 
-    {% include '@organisms/skip-link/skip-link.twig' with {
-      url: '#main-content',
-      theme: skip_link_theme,
-    } only %}
+{% include '@organisms/skip-link/skip-link.twig' with {
+  url: '#main-content',
+  theme: skip_link_theme,
+} only %}
 
-    {{ page_top }}
-    {{ page }}
-    {{ page_bottom }}
-    <js-bottom-placeholder token="{{ placeholder_token }}">
-  </body>
+{{ page_top }}
+{{ page }}
+{{ page_bottom }}
+<js-bottom-placeholder token="{{ placeholder_token }}">
+</body>
 </html>
diff --git a/web/themes/contrib/civictheme/templates/layout/page.html.twig b/web/themes/contrib/civictheme/templates/layout/page.html.twig
index 73721e2e0..7716c2155 100644
--- a/web/themes/contrib/civictheme/templates/layout/page.html.twig
+++ b/web/themes/contrib/civictheme/templates/layout/page.html.twig
@@ -5,7 +5,7 @@
  */
 #}
 {#
- # Note that variables are not scoped so that child themes could add more
- # variables without the need to change this template.
+# Note that variables are not scoped so that child themes could add more
+# variables without the need to change this template.
 #}
 {% include '@templates/page/page.twig' %}
diff --git a/web/themes/contrib/civictheme/templates/paragraphs/paragraph--civictheme-iframe.html.twig b/web/themes/contrib/civictheme/templates/paragraphs/paragraph--civictheme-iframe.html.twig
index e1f720d61..3bc17e752 100644
--- a/web/themes/contrib/civictheme/templates/paragraphs/paragraph--civictheme-iframe.html.twig
+++ b/web/themes/contrib/civictheme/templates/paragraphs/paragraph--civictheme-iframe.html.twig
@@ -6,4 +6,4 @@
 #}
 {% include '@atoms/iframe/iframe.twig' with {
   attributes: component_attributes,
-}%}
+} %}
diff --git a/web/themes/contrib/civictheme/templates/views/views-view.html.twig b/web/themes/contrib/civictheme/templates/views/views-view.html.twig
index 0a0302a82..7a743dd08 100644
--- a/web/themes/contrib/civictheme/templates/views/views-view.html.twig
+++ b/web/themes/contrib/civictheme/templates/views/views-view.html.twig
@@ -6,7 +6,7 @@
 #}
 {% extends '@organisms/list/list.twig' %}
 
-{#Override footer block to provide Drupal-specific view properties.#}
+{# Override footer block to provide Drupal-specific view properties. #}
 {% block footer %}
   {% if attachment_after is defined and attachment_after is not empty %}
     <div class="ct-list__attachment-after">