From cfc89d83435d26d712be380927e45164169dc8a1 Mon Sep 17 00:00:00 2001
From: Jesper Pedersen <jesper@yepz.dk>
Date: Mon, 6 May 2024 13:30:25 +0200
Subject: [PATCH 1/3] 1308: Use correct field in template.

---
 .../custom/cfia/templates/node/node--arrangement.html.twig      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/themes/custom/cfia/templates/node/node--arrangement.html.twig b/web/themes/custom/cfia/templates/node/node--arrangement.html.twig
index 3611d2f2b..d801d6870 100644
--- a/web/themes/custom/cfia/templates/node/node--arrangement.html.twig
+++ b/web/themes/custom/cfia/templates/node/node--arrangement.html.twig
@@ -7,7 +7,7 @@
             </div>
             <div class="display-portfolio">
                 <span>{{content.field_title_2.0}}</span> {# Title 2 #}
-                <h4>{{content.field_text_1.0}}</h4>
+                <h4>{{content.field_text_2.0}}</h4>
             </div>
             <div class="display-portfolio">
                 <span>{{content.field_title_3.0}}</span> {# Title 3 #}

From eb63cf7c02ad2ef3356e20a1bd77be888a0cbc43 Mon Sep 17 00:00:00 2001
From: Jesper Pedersen <jesper@yepz.dk>
Date: Mon, 6 May 2024 14:33:16 +0200
Subject: [PATCH 2/3] 1308: Only use collapse on sidebar when on mobile.

---
 web/themes/custom/cfia/css/style.css             | 16 +++++++++++++++-
 .../templates/block/_sidebar-block.html.twig     |  5 ++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/web/themes/custom/cfia/css/style.css b/web/themes/custom/cfia/css/style.css
index 093772798..107dc0435 100644
--- a/web/themes/custom/cfia/css/style.css
+++ b/web/themes/custom/cfia/css/style.css
@@ -289,7 +289,12 @@ a:hover, .link:hover {
 }
 
 .sidebar button.collapsed i {
-  transform: rotate(180deg);
+  display: none;
+  /*transform: rotate(180deg);*/
+}
+
+.sidebar .collapse:not(.show){
+  display: block;
 }
 
 /* Blockquotes */
@@ -397,4 +402,13 @@ a:hover, .link:hover {
     max-height: 10vh;
     width: auto;
   }
+
+  .sidebar button.collapsed i {
+    display: block;
+    transform: rotate(180deg);
+  }
+
+  .sidebar .collapse:not(.show){
+    display: none;
+  }
 }
diff --git a/web/themes/custom/cfia/templates/block/_sidebar-block.html.twig b/web/themes/custom/cfia/templates/block/_sidebar-block.html.twig
index 6c67f0e9d..b88974074 100644
--- a/web/themes/custom/cfia/templates/block/_sidebar-block.html.twig
+++ b/web/themes/custom/cfia/templates/block/_sidebar-block.html.twig
@@ -1,5 +1,4 @@
 <div class="mb-3">
-
   {% set accordionTarget = elements['#plugin_id']|clean_class %}
 
   {{ title_prefix }}
@@ -7,13 +6,13 @@
     <div class="title-border d-flex justify-content-between align-items-start">
       {# Sidebar widget title #}
       <h2{{ title_attributes }} class="sidebar-title">{{ label }}</h2>
-      <button class="btn" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{ accordionTarget }}" aria-expanded="true" aria-controls="collapse{{ accordionTarget }}">
+      <button class="btn collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{ accordionTarget }}" aria-expanded="false" aria-controls="collapse{{ accordionTarget }}">
         <i class="fas fa-angle-up"></i>
       </button>
     </div>
     {% endif %}
   {{ title_suffix }}
-  <div class="collapse show" id="collapse{{ accordionTarget }}" />
+  <div class="collapse" id="collapse{{ accordionTarget }}" />
     {% block content %}
       <div{{ content_attributes.addClass('content') }}>
         {{ content }}

From cde6595e59a6ba98d53ad4814022632b7f341633 Mon Sep 17 00:00:00 2001
From: Jesper Pedersen <jesper@yepz.dk>
Date: Tue, 7 May 2024 10:59:17 +0200
Subject: [PATCH 3/3] 1308: Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0ef44f37..a0ceddc84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # CHANGELOG
 
 ## Unreleased
-* Drupal 10 new theme demo pages
+* [PR-20](https://github.com/itk-dev/cfia/pull/20)
+  Fixes after release
 
 ## 2.0.0
 * Upgrade to drupal 10