From 9ea0f2ec29ea0595eb35e3a8fd1848e74ac245c6 Mon Sep 17 00:00:00 2001 From: Tim Down <158919+timdown@users.noreply.github.com> Date: Mon, 7 Apr 2025 14:56:51 +0100 Subject: [PATCH] Merge pull request #24606 from overleaf/td-bs5-make-default Make Bootstrap 5 the default everywhere GitOrigin-RevId: 024614d6f4f370fd9c9623a6f35c64e43d2a70c4 --- services/web/app/views/admin/index.pug | 3 --- services/web/app/views/layout-base.pug | 2 +- services/web/app/views/layout-website-redesign-bootstrap-5.pug | 1 - services/web/app/views/project/editor/socket_diagnostics.pug | 1 - services/web/app/views/project/ide-react-detached.pug | 1 - services/web/app/views/project/ide-react.pug | 1 - services/web/app/views/project/list-react.pug | 1 - services/web/app/views/project/token/access-react.pug | 1 - services/web/app/views/project/token/sharing-updates.pug | 1 - services/web/app/views/subscriptions/add-seats.pug | 3 --- .../app/views/subscriptions/canceled-subscription-react.pug | 3 --- services/web/app/views/subscriptions/dashboard-react.pug | 3 --- .../views/subscriptions/manually-collected-subscription.pug | 3 --- .../app/views/subscriptions/missing-billing-information.pug | 3 --- services/web/app/views/subscriptions/preview-change.pug | 3 --- .../web/app/views/subscriptions/subtotal-limit-exceeded.pug | 3 --- .../app/views/subscriptions/successful-subscription-react.pug | 3 --- services/web/app/views/subscriptions/team/group-invites.pug | 3 --- services/web/app/views/subscriptions/team/invite-managed.pug | 3 --- services/web/app/views/subscriptions/team/invite.pug | 3 --- .../web/app/views/subscriptions/team/invite_logged_out.pug | 3 --- .../views/subscriptions/upgrade-group-subscription-react.pug | 3 --- services/web/app/views/user/addSecondaryEmail.pug | 1 - services/web/app/views/user/compromised_password.pug | 1 - services/web/app/views/user/confirmSecondaryEmail.pug | 1 - services/web/app/views/user/settings.pug | 1 - .../web/app/views/user_membership/group-managers-react.pug | 3 --- services/web/app/views/user_membership/group-members-react.pug | 3 --- .../app/views/user_membership/institution-managers-react.pug | 3 --- .../web/app/views/user_membership/publisher-managers-react.pug | 3 --- 30 files changed, 1 insertion(+), 66 deletions(-) diff --git a/services/web/app/views/admin/index.pug b/services/web/app/views/admin/index.pug index dbc8cbdb79..aaf2228cbc 100644 --- a/services/web/app/views/admin/index.pug +++ b/services/web/app/views/admin/index.pug @@ -1,9 +1,6 @@ extends ../layout-marketing include ../_mixins/bookmarkable_tabset -block vars - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - block content .content.content-alt#main-content .container diff --git a/services/web/app/views/layout-base.pug b/services/web/app/views/layout-base.pug index df503b6356..0493281353 100644 --- a/services/web/app/views/layout-base.pug +++ b/services/web/app/views/layout-base.pug @@ -6,7 +6,7 @@ html( class=(fixedSizeDocument ? 'fixed-size-document' : undefined) ) - metadata = metadata || {} - - let bootstrap5PageStatus = 'disabled' // One of 'disabled', 'enabled', and 'queryStringOnly' + - let bootstrap5PageStatus = 'enabled' // One of 'disabled' and 'enabled' - let bootstrap5PageSplitTest = '' // Limits Bootstrap 5 usage on this page to users with an assignment of "enabled" for the specified split test. If left empty and bootstrap5PageStatus is "enabled", the page always uses Bootstrap 5. - let isWebsiteRedesign = false - let isApplicationPage = false diff --git a/services/web/app/views/layout-website-redesign-bootstrap-5.pug b/services/web/app/views/layout-website-redesign-bootstrap-5.pug index 092f5b765d..e6dc3a8827 100644 --- a/services/web/app/views/layout-website-redesign-bootstrap-5.pug +++ b/services/web/app/views/layout-website-redesign-bootstrap-5.pug @@ -5,7 +5,6 @@ include ./_mixins/bootstrap_js block entrypointVar - entrypoint = 'marketing' - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - isWebsiteRedesign = true block body diff --git a/services/web/app/views/project/editor/socket_diagnostics.pug b/services/web/app/views/project/editor/socket_diagnostics.pug index 841f4b517b..6876e7e39b 100644 --- a/services/web/app/views/project/editor/socket_diagnostics.pug +++ b/services/web/app/views/project/editor/socket_diagnostics.pug @@ -4,7 +4,6 @@ block vars - var suppressNavbar = true - var suppressFooter = true - var suppressGoogleAnalytics = true - - bootstrap5PageStatus = 'enabled' - isWebsiteRedesign = 'true' block entrypointVar diff --git a/services/web/app/views/project/ide-react-detached.pug b/services/web/app/views/project/ide-react-detached.pug index 4c9a633b5f..8109da7f74 100644 --- a/services/web/app/views/project/ide-react-detached.pug +++ b/services/web/app/views/project/ide-react-detached.pug @@ -8,7 +8,6 @@ block vars - var suppressFooter = true - var suppressSkipToContent = true - var suppressCookieBanner = true - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - metadata.robotsNoindexNofollow = true block content diff --git a/services/web/app/views/project/ide-react.pug b/services/web/app/views/project/ide-react.pug index a16345bbe9..bc30f69202 100644 --- a/services/web/app/views/project/ide-react.pug +++ b/services/web/app/views/project/ide-react.pug @@ -5,7 +5,6 @@ block vars - var suppressFooter = true - var suppressSkipToContent = true - var deferScripts = true - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - metadata.robotsNoindexNofollow = true - enableIeeeBranding = false diff --git a/services/web/app/views/project/list-react.pug b/services/web/app/views/project/list-react.pug index d24ce08449..be9233ecbb 100644 --- a/services/web/app/views/project/list-react.pug +++ b/services/web/app/views/project/list-react.pug @@ -7,7 +7,6 @@ block vars - const suppressNavContentLinks = true - const suppressNavbar = true - const suppressFooter = true - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' block append meta meta(name="ol-usersBestSubscription" data-type="json" content=usersBestSubscription) diff --git a/services/web/app/views/project/token/access-react.pug b/services/web/app/views/project/token/access-react.pug index 734ffa053f..83e9f79b61 100644 --- a/services/web/app/views/project/token/access-react.pug +++ b/services/web/app/views/project/token/access-react.pug @@ -7,7 +7,6 @@ block vars - var suppressFooter = true - var suppressCookieBanner = true - var suppressSkipToContent = true - - bootstrap5PageStatus = 'enabled' block append meta meta(name="ol-postUrl" data-type="string" content=postUrl) diff --git a/services/web/app/views/project/token/sharing-updates.pug b/services/web/app/views/project/token/sharing-updates.pug index 61cf8b5e6a..a0afb0c621 100644 --- a/services/web/app/views/project/token/sharing-updates.pug +++ b/services/web/app/views/project/token/sharing-updates.pug @@ -7,7 +7,6 @@ block vars - var suppressFooter = true - var suppressCookieBanner = true - var suppressSkipToContent = true - - bootstrap5PageStatus = 'enabled' block append meta meta(name="ol-project_id" data-type="string" content=projectId) diff --git a/services/web/app/views/subscriptions/add-seats.pug b/services/web/app/views/subscriptions/add-seats.pug index 9dd92da454..fb04ef91fb 100644 --- a/services/web/app/views/subscriptions/add-seats.pug +++ b/services/web/app/views/subscriptions/add-seats.pug @@ -1,8 +1,5 @@ extends ../layout-marketing -block vars - - bootstrap5PageStatus = 'enabled' // Enforce BS5 version - block entrypointVar - entrypoint = 'pages/user/subscription/group-management/add-seats' diff --git a/services/web/app/views/subscriptions/canceled-subscription-react.pug b/services/web/app/views/subscriptions/canceled-subscription-react.pug index 653f75c481..3a89234fd9 100644 --- a/services/web/app/views/subscriptions/canceled-subscription-react.pug +++ b/services/web/app/views/subscriptions/canceled-subscription-react.pug @@ -1,8 +1,5 @@ extends ../layout-react -block vars - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - block entrypointVar - entrypoint = 'pages/user/subscription/canceled-subscription' diff --git a/services/web/app/views/subscriptions/dashboard-react.pug b/services/web/app/views/subscriptions/dashboard-react.pug index 388f60c864..aa3e597dc5 100644 --- a/services/web/app/views/subscriptions/dashboard-react.pug +++ b/services/web/app/views/subscriptions/dashboard-react.pug @@ -1,8 +1,5 @@ extends ../layout-react -block vars - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - block entrypointVar - entrypoint = 'pages/user/subscription/dashboard' diff --git a/services/web/app/views/subscriptions/manually-collected-subscription.pug b/services/web/app/views/subscriptions/manually-collected-subscription.pug index b0e1db986b..1555ac2ea1 100644 --- a/services/web/app/views/subscriptions/manually-collected-subscription.pug +++ b/services/web/app/views/subscriptions/manually-collected-subscription.pug @@ -1,8 +1,5 @@ extends ../layout-marketing -block vars - - bootstrap5PageStatus = 'enabled' // Enforce BS5 version - block entrypointVar - entrypoint = 'pages/user/subscription/group-management/manually-collected-subscription' diff --git a/services/web/app/views/subscriptions/missing-billing-information.pug b/services/web/app/views/subscriptions/missing-billing-information.pug index ddb2ac1693..67d13f8e89 100644 --- a/services/web/app/views/subscriptions/missing-billing-information.pug +++ b/services/web/app/views/subscriptions/missing-billing-information.pug @@ -1,8 +1,5 @@ extends ../layout-marketing -block vars - - bootstrap5PageStatus = 'enabled' // Enforce BS5 version - block entrypointVar - entrypoint = 'pages/user/subscription/group-management/missing-billing-information' diff --git a/services/web/app/views/subscriptions/preview-change.pug b/services/web/app/views/subscriptions/preview-change.pug index 320d4d7bdc..ab70d2d6b6 100644 --- a/services/web/app/views/subscriptions/preview-change.pug +++ b/services/web/app/views/subscriptions/preview-change.pug @@ -1,8 +1,5 @@ extends ../layout-marketing -block vars - - bootstrap5PageStatus = 'enabled' - block entrypointVar - entrypoint = 'pages/user/subscription/preview-change' diff --git a/services/web/app/views/subscriptions/subtotal-limit-exceeded.pug b/services/web/app/views/subscriptions/subtotal-limit-exceeded.pug index bdbad595ee..15f79488fa 100644 --- a/services/web/app/views/subscriptions/subtotal-limit-exceeded.pug +++ b/services/web/app/views/subscriptions/subtotal-limit-exceeded.pug @@ -1,8 +1,5 @@ extends ../layout-marketing -block vars - - bootstrap5PageStatus = 'enabled' // Enforce BS5 version - block entrypointVar - entrypoint = 'pages/user/subscription/group-management/subtotal-limit-exceeded' diff --git a/services/web/app/views/subscriptions/successful-subscription-react.pug b/services/web/app/views/subscriptions/successful-subscription-react.pug index e7599e816a..5ce208b034 100644 --- a/services/web/app/views/subscriptions/successful-subscription-react.pug +++ b/services/web/app/views/subscriptions/successful-subscription-react.pug @@ -1,8 +1,5 @@ extends ../layout-react -block vars - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - block entrypointVar - entrypoint = 'pages/user/subscription/successful-subscription' diff --git a/services/web/app/views/subscriptions/team/group-invites.pug b/services/web/app/views/subscriptions/team/group-invites.pug index cef44909eb..81c70f1885 100644 --- a/services/web/app/views/subscriptions/team/group-invites.pug +++ b/services/web/app/views/subscriptions/team/group-invites.pug @@ -1,8 +1,5 @@ extends ../../layout-react -block vars - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - block entrypointVar - entrypoint = 'pages/user/subscription/group-invites' diff --git a/services/web/app/views/subscriptions/team/invite-managed.pug b/services/web/app/views/subscriptions/team/invite-managed.pug index 78599efb91..f59b8b4937 100644 --- a/services/web/app/views/subscriptions/team/invite-managed.pug +++ b/services/web/app/views/subscriptions/team/invite-managed.pug @@ -1,8 +1,5 @@ extends ../../layout-react -block vars - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - block entrypointVar - entrypoint = 'pages/user/subscription/invite-managed' diff --git a/services/web/app/views/subscriptions/team/invite.pug b/services/web/app/views/subscriptions/team/invite.pug index 75fd131ae2..dc1b509cbf 100644 --- a/services/web/app/views/subscriptions/team/invite.pug +++ b/services/web/app/views/subscriptions/team/invite.pug @@ -1,8 +1,5 @@ extends ../../layout-react -block vars - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - block entrypointVar - entrypoint = 'pages/user/subscription/invite' diff --git a/services/web/app/views/subscriptions/team/invite_logged_out.pug b/services/web/app/views/subscriptions/team/invite_logged_out.pug index e994a6ce24..d07fa5368c 100644 --- a/services/web/app/views/subscriptions/team/invite_logged_out.pug +++ b/services/web/app/views/subscriptions/team/invite_logged_out.pug @@ -1,8 +1,5 @@ extends ../../layout-react -block vars - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - block append meta meta(name="ol-user" data-type="json" content=user) diff --git a/services/web/app/views/subscriptions/upgrade-group-subscription-react.pug b/services/web/app/views/subscriptions/upgrade-group-subscription-react.pug index 4ac2999ee5..c482629463 100644 --- a/services/web/app/views/subscriptions/upgrade-group-subscription-react.pug +++ b/services/web/app/views/subscriptions/upgrade-group-subscription-react.pug @@ -1,8 +1,5 @@ extends ../layout-marketing -block vars - - bootstrap5PageStatus = 'enabled' // Enforce BS5 version - block entrypointVar - entrypoint = 'pages/user/subscription/group-management/upgrade-group-subscription' diff --git a/services/web/app/views/user/addSecondaryEmail.pug b/services/web/app/views/user/addSecondaryEmail.pug index 68c506c977..8f38df96aa 100644 --- a/services/web/app/views/user/addSecondaryEmail.pug +++ b/services/web/app/views/user/addSecondaryEmail.pug @@ -3,7 +3,6 @@ extends ../layout-react block vars - var suppressNavbar = true - var suppressSkipToContent = true - - bootstrap5PageStatus = 'enabled' block entrypointVar - entrypoint = 'pages/user/add-secondary-email' diff --git a/services/web/app/views/user/compromised_password.pug b/services/web/app/views/user/compromised_password.pug index a6d83aeb92..e56ffd9841 100644 --- a/services/web/app/views/user/compromised_password.pug +++ b/services/web/app/views/user/compromised_password.pug @@ -4,7 +4,6 @@ block vars - var suppressNavbar = true - var suppressFooter = true - var suppressGoogleAnalytics = true - - bootstrap5PageStatus = 'enabled' block entrypointVar - entrypoint = 'pages/compromised-password' diff --git a/services/web/app/views/user/confirmSecondaryEmail.pug b/services/web/app/views/user/confirmSecondaryEmail.pug index 95927f2f05..4d0c59e9db 100644 --- a/services/web/app/views/user/confirmSecondaryEmail.pug +++ b/services/web/app/views/user/confirmSecondaryEmail.pug @@ -3,7 +3,6 @@ extends ../layout-marketing block vars - var suppressNavbar = true - var suppressSkipToContent = true - - bootstrap5PageStatus = 'enabled' block entrypointVar - entrypoint = 'pages/user/confirm-secondary-email' diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug index 45d6ebeb90..57eef44c27 100644 --- a/services/web/app/views/user/settings.pug +++ b/services/web/app/views/user/settings.pug @@ -4,7 +4,6 @@ block entrypointVar - entrypoint = 'pages/user/settings' block vars - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - isWebsiteRedesign = true block append meta diff --git a/services/web/app/views/user_membership/group-managers-react.pug b/services/web/app/views/user_membership/group-managers-react.pug index ed2f3454db..f4d8c0e973 100644 --- a/services/web/app/views/user_membership/group-managers-react.pug +++ b/services/web/app/views/user_membership/group-managers-react.pug @@ -3,9 +3,6 @@ extends ../layout-marketing block entrypointVar - entrypoint = 'pages/user/subscription/group-management/group-managers' -block vars - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - block append meta meta(name="ol-users", data-type="json", content=users) meta(name="ol-groupId", data-type="string", content=groupId) diff --git a/services/web/app/views/user_membership/group-members-react.pug b/services/web/app/views/user_membership/group-members-react.pug index b146d0d143..314a332489 100644 --- a/services/web/app/views/user_membership/group-members-react.pug +++ b/services/web/app/views/user_membership/group-members-react.pug @@ -3,9 +3,6 @@ extends ../layout-marketing block entrypointVar - entrypoint = 'pages/user/subscription/group-management/group-members' -block vars - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - block append meta meta(name="ol-users", data-type="json", content=users) meta(name="ol-groupId", data-type="string", content=groupId) diff --git a/services/web/app/views/user_membership/institution-managers-react.pug b/services/web/app/views/user_membership/institution-managers-react.pug index dfe59364dc..690e8409f2 100644 --- a/services/web/app/views/user_membership/institution-managers-react.pug +++ b/services/web/app/views/user_membership/institution-managers-react.pug @@ -3,9 +3,6 @@ extends ../layout-marketing block entrypointVar - entrypoint = 'pages/user/subscription/group-management/institution-managers' -block vars - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - block append meta meta(name="ol-users", data-type="json", content=users) meta(name="ol-groupId", data-type="string", content=groupId) diff --git a/services/web/app/views/user_membership/publisher-managers-react.pug b/services/web/app/views/user_membership/publisher-managers-react.pug index 84bcbea80c..793bdf9602 100644 --- a/services/web/app/views/user_membership/publisher-managers-react.pug +++ b/services/web/app/views/user_membership/publisher-managers-react.pug @@ -3,9 +3,6 @@ extends ../layout-marketing block entrypointVar - entrypoint = 'pages/user/subscription/group-management/publisher-managers' -block vars - - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - block append meta meta(name="ol-users", data-type="json", content=users) meta(name="ol-groupId", data-type="string", content=groupId)