Merge branch 'main' into VACMS-12252-drupal-10

department-of-veterans-affairs · Nov 29, 2023 · d237e20 · d237e20
2 parents 576cc61 + 639d214
commit d237e20
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -219,7 +219,7 @@
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
         "twig/twig": "3.7.0 as 3.6",
-        "va-gov/content-build": "^0.0.3393",
+        "va-gov/content-build": "^0.0.3394",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",

diff --git a/composer.lock b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6a1f2b50df52d55bc6258012cd55ae8a",
+    "content-hash": "783ccf5e162ba53ba67db5c06c8b9e52",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -25674,16 +25674,16 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3393",
+            "version": "v0.0.3394",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
-                "reference": "98905f700263ccb9f19690ef5d51c70aa8712e4b"
+                "reference": "838acf095462ab786a6b5be4b0c1caaf42409291"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/98905f700263ccb9f19690ef5d51c70aa8712e4b",
-                "reference": "98905f700263ccb9f19690ef5d51c70aa8712e4b",
+                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/838acf095462ab786a6b5be4b0c1caaf42409291",
+                "reference": "838acf095462ab786a6b5be4b0c1caaf42409291",
                 "shasum": ""
             },
             "type": "node-project",
@@ -25710,9 +25710,9 @@
             "description": "Front-end for VA.gov. This repository contains the code that generates the www.va.gov website. It contains a Metalsmith static site builder that uses a Drupal CMS for content. This file is here to publish releases to https://packagist.org/packages/va-gov/content-build, so that the CMS CI system can install it and update it using standard composer processes, and so that we can run tests across both systems. See https://github.com/department-of-veterans-affairs/va.gov-cms for the CMS repo, and stand by for more documentation.",
             "support": {
                 "issues": "https://github.com/department-of-veterans-affairs/content-build/issues",
-                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3393"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3394"
             },
-            "time": "2023-11-27T19:24:05+00:00"
+            "time": "2023-11-28T18:03:25+00:00"
         },
         {
             "name": "vlucas/phpdotenv",

diff --git a/docroot/themes/custom/vagovclaro/templates/page/page--node.html.twig b/docroot/themes/custom/vagovclaro/templates/page/page--node.html.twig
@@ -50,6 +50,14 @@
     {{ page.breadcrumb }}
 
     <div class="node-columns">
+      {% set has_sidebar_first = page.sidebar_first|render|striptags|trim is not empty %}
+      {% if has_sidebar_first %}
+        <aside class="layout-sidebar-first" aria-label="Section Menu" role="complementary">
+        {{ page.sidebar_first }}
+
+        </aside>{# /.layout-sidebar-first #}
+      {% endif %}
+
       <main class="page-content clearfix" role="main">
         <div class="visually-hidden"><a id="main-content" tabindex="-1"></a></div>
         {{ page.highlighted }}
@@ -61,14 +69,6 @@
         {{ page.content }}
       </main>
 
-      {% set has_sidebar_first = page.sidebar_first|render|striptags|trim is not empty %}
-      {% if has_sidebar_first %}
-        <aside class="layout-sidebar-first" aria-label="Section Menu" role="complementary">
-          {{ page.sidebar_first }}
-
-        </aside>{# /.layout-sidebar-first #}
-      {% endif %}
-
       {% if page.sidebar_second %}
         <aside class="layout-sidebar-second" aria-label="Content Metadata" role="complementary">
           {{ page.sidebar_second }}