Merge pull request #20343 from overleaf/jel-begin-cms-bs5

[web] Begin Bootstrap 5 on CMS pages

GitOrigin-RevId: 886dc0c3afb7b61577838de12bc60f22e09c1db8
This commit is contained in:
Jessica Lawshe 2024-09-16 10:05:13 -05:00 committed by Copybot
parent 3746abc640
commit 42a6464866
3 changed files with 38 additions and 2 deletions

View file

@ -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)

View file

@ -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)

View file

@ -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