From e23fc1fe11c7777bcb8855db523c05b7f6980ead Mon Sep 17 00:00:00 2001
From: bwang <bwang@wikimedia.org>
Date: Thu, 30 Jun 2022 11:42:55 -0500
Subject: [PATCH] Grid: fix footer styles

Fixes https://phabricator.wikimedia.org/F35289862

Change-Id: If14bfb357d077ebd3886ce7290f0d46d19588dc6
---
 includes/templates/skin.mustache                | 4 ++--
 resources/skins.vector.styles/layouts/grid.less | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/templates/skin.mustache b/includes/templates/skin.mustache
index 3284760d..97910385 100644
--- a/includes/templates/skin.mustache
+++ b/includes/templates/skin.mustache
@@ -91,9 +91,9 @@
 {{^is-vector-grid}}</div>{{/is-vector-grid}} <!-- close .vector-sidebar-container -->
 
 <div class="mw-workspace-container mw-footer-container">
-	<div class="mw-content-container">
+	{{^is-vector-grid}}<div class="mw-content-container">{{/is-vector-grid}}
 		{{#data-footer}}{{>Footer}}{{/data-footer}}
-	</div>
+	{{^is-vector-grid}}</div>{{/is-vector-grid}}
 </div>
 	</div> {{! END mw-page-container-inner }}
 </div> {{! END mw-page-container }}
diff --git a/resources/skins.vector.styles/layouts/grid.less b/resources/skins.vector.styles/layouts/grid.less
index c77a0431..0ddb0122 100644
--- a/resources/skins.vector.styles/layouts/grid.less
+++ b/resources/skins.vector.styles/layouts/grid.less
@@ -56,7 +56,7 @@
 		.mw-page-container-inner {
 			display: grid;
 			width: 100%;
-			grid-template: ~'66px min-content 1fr 1fr / 232px 20px minmax(0, 1fr)';
+			grid-template: ~'66px min-content 1fr min-content / 232px 20px minmax(0, 1fr)';
 			grid-template-areas: 'header header header'
 				'sidebar gutter content'
 				'toc gutter content'