Merge branch 'publications-improvements' into test

eea · Jan 26, 2024 · 1f6fb6c · 1f6fb6c
2 parents 2f2af92 + a31d2e4
commit 1f6fb6c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/web/themes/custom/parc/css/components/content/publications/vm-default/style.css b/web/themes/custom/parc/css/components/content/publications/vm-default/style.css
diff --git a/web/themes/custom/parc/parc.theme b/web/themes/custom/parc/parc.theme
@@ -424,10 +424,11 @@ function parc_preprocess_paragraph__newsletter(&$variables) {
   if ($block instanceof BlockContent
     && $block->hasField('field_show_season')
     && $block->get('field_show_season')->value) {
-    $spring = (new DateTime('March 1'))->format('Y-m-d');
-    $summer = (new DateTime('June 1'))->format('Y-m-d');
-    $autumn = (new DateTime('September 1'))->format('Y-m-d');
-    $winter = (new DateTime('December 1'))->format('Y-m-d');
+    $year = date('Y', strtotime($date));
+    $spring = "$year-03-01";
+    $summer = "$year-06-01";
+    $autumn = "$year-09-01";
+    $winter = "$year-12-01";
 
     switch (TRUE) {
       case $date >= $spring && $date < $summer:

diff --git a/...efault/_fields/field-group-html-element--node--publications--group-key-messages.html.twig b/...efault/_fields/field-group-html-element--node--publications--group-key-messages.html.twig
@@ -6,11 +6,11 @@
 #}
 
 {% if element.field_regulatory_message.0 %}
-  {% if element.field_key_messages.2 %}
+  {% if element.field_key_messages.1 %}
     {% set showArrow = true %}
   {% endif %}
 {% else %}
-  {% if element.field_key_messages.3 %}
+  {% if element.field_key_messages.2 %}
     {% set showArrow = true %}
   {% endif %}
 {% endif %}

diff --git a/web/themes/custom/parc/templates/components/content/publications/vm-default/style.pcss.css b/web/themes/custom/parc/templates/components/content/publications/vm-default/style.pcss.css
@@ -209,8 +209,8 @@
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: 100%;
     font-size: 18px;
+    height: auto;
 
     &:not(.field-regulatory-message):hover {
       --cs-svg-c: var(--cs--item-bg);
@@ -227,6 +227,7 @@
 
     .field--content {
       margin-top: 10px;
+      margin-bottom: 20px;
       margin-right: 20px;
     }