From 42a64648661813b70f599941cb289298de87c8d9 Mon Sep 17 00:00:00 2001
From: Jessica Lawshe <5312836+lawshe@users.noreply.github.com>
Date: Mon, 16 Sep 2024 10:05:13 -0500
Subject: [PATCH] Merge pull request #20343 from overleaf/jel-begin-cms-bs5

[web] Begin Bootstrap 5 on CMS pages

GitOrigin-RevId: 886dc0c3afb7b61577838de12bc60f22e09c1db8
---
 services/web/app/views/layout-base.pug        |  6 +++-
 .../layout-website-redesign-bootstrap-5.pug   | 30 +++++++++++++++++++
 .../layout/navbar-marketing-bootstrap-5.pug   |  4 ++-
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 services/web/app/views/layout-website-redesign-bootstrap-5.pug

diff --git a/services/web/app/views/layout-base.pug b/services/web/app/views/layout-base.pug
index 53e88d8131..c9eec5fe6e 100644
--- a/services/web/app/views/layout-base.pug
+++ b/services/web/app/views/layout-base.pug
@@ -8,6 +8,7 @@ html(
 	- metadata = metadata || {}
 	- let bootstrap5PageStatus = 'disabled' // One of 'disabled', 'enabled', and 'queryStringOnly'
 	- let bootstrap5PageSplitTest = ''
+	- let isWebsiteRedesign = false
 
 	block entrypointVar
 
@@ -73,7 +74,10 @@ html(
 
 		block head-scripts
 
-	body(class=(showThinFooter ? 'thin-footer' : undefined), data-theme="default")
+	body(class={
+		'thin-footer': showThinFooter,
+		'website-redesign': isWebsiteRedesign === true
+	}, data-theme="default")
 		if(settings.recaptcha && settings.recaptcha.siteKeyV3)
 			script(type="text/javascript", nonce=scriptNonce, src="https://www.recaptcha.net/recaptcha/api.js?render=" + settings.recaptcha.siteKeyV3, defer=deferScripts)
 
diff --git a/services/web/app/views/layout-website-redesign-bootstrap-5.pug b/services/web/app/views/layout-website-redesign-bootstrap-5.pug
new file mode 100644
index 0000000000..12f01ac953
--- /dev/null
+++ b/services/web/app/views/layout-website-redesign-bootstrap-5.pug
@@ -0,0 +1,30 @@
+extends ./layout-base
+
+include ./_mixins/formMessages
+include ./_mixins/bootstrap_js
+
+block entrypointVar
+	- entrypoint = 'marketing'
+	- bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly'
+	- bootstrap5Override = true
+	- isWebsiteRedesign = true
+
+block body
+	if (typeof(suppressNavbar) == "undefined")
+		include layout/navbar-marketing-bootstrap-5
+
+	block content
+
+	if (typeof(suppressFooter) == "undefined")
+		if showThinFooter
+			include layout/footer-marketing
+		else
+			include layout/fat-footer-website-redesign
+
+	if (typeof(suppressCookieBanner) == 'undefined')
+		include _cookie_banner
+
+	!= moduleIncludes("contactModal-marketing-bootstrap-5", locals)
+
+block prepend foot-scripts
+	+bootstrap-js(5)
\ No newline at end of file
diff --git a/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug b/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug
index 2f81177b8d..c2e3bb1c74 100644
--- a/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug
+++ b/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug
@@ -1,6 +1,8 @@
 include ../_mixins/navbar
 
-nav.navbar.navbar-default.navbar-main.navbar-expand-lg
+nav.navbar.navbar-default.navbar-main.navbar-expand-lg(class={
+	'website-redesign-navbar': isWebsiteRedesign
+})
 	.container-fluid.navbar-container
 		.navbar-header
 			if settings.nav.custom_logo