Merge pull request #113 from nswdpc/fix-remove-sidebar-desktop

Fix remove sidebar desktop
nswdpc · Jul 24, 2024 · cfabaf2 · cfabaf2
2 parents b548052 + 2b6d9cf
commit cfabaf2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/themes/nswds/templates/NSWDPC/Waratah/Includes/LastUpdated.ss b/themes/nswds/templates/NSWDPC/Waratah/Includes/LastUpdated.ss
@@ -1,16 +1,11 @@
 <% if $PageLastUpdated %>
-<section class="nsw-section">
-    <% if $Top.IsLandingPage %>
-        <div class="nsw-container">
-    <% end_if %>
+<div class="nsw-container">
+    <section class="nsw-section">
 
     <% with $PageLastUpdated %>
         <p><strong><%t nswds.PAGE_LAST_UPDATE 'Last updated' %>:</strong> <time datetime="{$Machine}">{$Human}</time></p>
     <% end_with %>
 
-    <% if $Top.IsLandingPage %>
-    </div>
-    <% end_if %>
-
-</section>
+    </section>
+</div>
 <% end_if %>
diff --git a/themes/nswds/templates/NSWDPC/Waratah/Includes/PageContent.ss b/themes/nswds/templates/NSWDPC/Waratah/Includes/PageContent.ss
@@ -31,4 +31,3 @@
 <% end_if %>
 
 <% include NSWDPC/Waratah/PageForm %>
-<% include NSWDPC/Waratah/LastUpdated %>
diff --git a/themes/nswds/templates/NSWDPC/Waratah/Includes/PageWrapper.ss b/themes/nswds/templates/NSWDPC/Waratah/Includes/PageWrapper.ss
@@ -16,7 +16,7 @@
             <main id="main-content" class="nsw-layout__main">
             <% include NSWDPC/Waratah/PageContent PerLayoutContentTemplate=$PerLayoutContentTemplate, PerLayoutContentAboveElemental=$PerLayoutContentAboveElemental %>
             </main>
-            <aside class="nsw-layout__sidebar nsw-layout__sidebar--desktop">
+            <aside class="nsw-layout__sidebar">
             <% include NSWDPC/Waratah/Sidebar %>
             </aside>
         </div>
@@ -48,3 +48,5 @@
     </div>
 
 <% end_if %>
+
+<% include NSWDPC/Waratah/LastUpdated %>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,4 +31,3 @@
		<% end_if %>

		<% include NSWDPC/Waratah/PageForm %>
		<% include NSWDPC/Waratah/LastUpdated %>