diff --git a/services/web/app/src/Features/TokenAccess/TokenAccessController.mjs b/services/web/app/src/Features/TokenAccess/TokenAccessController.mjs index c6722d3d2b..94cf48894a 100644 --- a/services/web/app/src/Features/TokenAccess/TokenAccessController.mjs +++ b/services/web/app/src/Features/TokenAccess/TokenAccessController.mjs @@ -20,6 +20,7 @@ import { getSafeAdminDomainRedirect } from '../Helpers/UrlHelper.js' import UserGetter from '../User/UserGetter.js' import Settings from '@overleaf/settings' import LimitationsManager from '../Subscription/LimitationsManager.js' +import SplitTestHandler from '../SplitTests/SplitTestHandler.js' const orderedPrivilegeLevels = [ PrivilegeLevels.NONE, @@ -111,6 +112,13 @@ async function tokenAccessPage(req, res, next) { } } + // Populates splitTestVariants with a value for the split test name and allows + // Pug to read it + await SplitTestHandler.promises.getAssignment( + req, + res, + 'misc-b2c-pages-bs5' + ) res.render('project/token/access-react', { postUrl: makePostUrl(token), }) diff --git a/services/web/app/views/project/token/access-react.pug b/services/web/app/views/project/token/access-react.pug index 83e9f79b61..121cafa451 100644 --- a/services/web/app/views/project/token/access-react.pug +++ b/services/web/app/views/project/token/access-react.pug @@ -7,6 +7,8 @@ block vars - var suppressFooter = true - var suppressCookieBanner = true - var suppressSkipToContent = true + - bootstrap5PageStatus = 'enabled' + - bootstrap5PageSplitTest = 'misc-b2c-pages-bs5' block append meta meta(name="ol-postUrl" data-type="string" content=postUrl) diff --git a/services/web/frontend/js/features/token-access/components/require-accept-screen.tsx b/services/web/frontend/js/features/token-access/components/require-accept-screen.tsx index 72b0e8a132..7fc34917db 100644 --- a/services/web/frontend/js/features/token-access/components/require-accept-screen.tsx +++ b/services/web/frontend/js/features/token-access/components/require-accept-screen.tsx @@ -18,45 +18,47 @@ export const RequireAcceptScreen: FC<{
-
-
-

- {t('youre_joining')} -
- - - {requireAcceptData.projectName || 'This project'} - - - {user && ( - <> -
- {t('as_email', { email: user.email })} - - )} -

+
+
+
+

+ {t('youre_joining')} +
+ + + {requireAcceptData.projectName || 'This project'} + + + {user && ( + <> +
+ {t('as_email', { email: user.email })} + + )} +

+
-
-
-
-

- {t( - 'your_name_and_email_address_will_be_visible_to_the_project_owner_and_other_editors' - )} -

+
+
+

+ {t( + 'your_name_and_email_address_will_be_visible_to_the_project_owner_and_other_editors' + )} +

+
-
-
-
- +
+
+ +
diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/all.scss b/services/web/frontend/stylesheets/bootstrap-5/components/all.scss index 772ad200d6..1ccb913a7a 100644 --- a/services/web/frontend/stylesheets/bootstrap-5/components/all.scss +++ b/services/web/frontend/stylesheets/bootstrap-5/components/all.scss @@ -38,3 +38,4 @@ @import 'collapsible-file-header'; @import 'panel-heading'; @import 'menu-bar'; +@import 'invite'; diff --git a/services/web/frontend/stylesheets/bootstrap-5/components/invite.scss b/services/web/frontend/stylesheets/bootstrap-5/components/invite.scss new file mode 100644 index 0000000000..6be4249ee2 --- /dev/null +++ b/services/web/frontend/stylesheets/bootstrap-5/components/invite.scss @@ -0,0 +1,8 @@ +.link-sharing-invite { + font-family: 'Noto Sans', sans-serif; + + .link-sharing-invite-header { + font-size: var(--font-size-07); + line-height: var(--line-height-06); + } +}