From 37444c5eeff6cbfafe65c0655e5894d25af744f3 Mon Sep 17 00:00:00 2001 From: M Fahru Date: Thu, 6 Feb 2025 08:30:18 -0700 Subject: [PATCH] Merge pull request #23063 from overleaf/mf-teardown-bs5-homepage [web] Tear down bs5-homepage feature flag and remove bs3 homepage code GitOrigin-RevId: f7fca07c0fb958682c6eed7fdf824818c1039be7 --- .../Features/StaticPages/HomeController.mjs | 14 +- .../js/features/autoplay-video/index.js | 3 +- .../frontend/stylesheets/app/homepage.less | 284 ------------------ .../stylesheets/app/review-features-page.less | 12 + .../web/frontend/stylesheets/main-style.less | 1 - 5 files changed, 14 insertions(+), 300 deletions(-) delete mode 100644 services/web/frontend/stylesheets/app/homepage.less diff --git a/services/web/app/src/Features/StaticPages/HomeController.mjs b/services/web/app/src/Features/StaticPages/HomeController.mjs index d8251bb1d0..cc7361217d 100644 --- a/services/web/app/src/Features/StaticPages/HomeController.mjs +++ b/services/web/app/src/Features/StaticPages/HomeController.mjs @@ -6,7 +6,6 @@ import ErrorController from '../Errors/ErrorController.js' import SessionManager from '../Authentication/SessionManager.js' import { expressify } from '@overleaf/promise-utils' import logger from '@overleaf/logger' -import SplitTestHandler from '../SplitTests/SplitTestHandler.js' const __dirname = new URL('.', import.meta.url).pathname @@ -32,18 +31,7 @@ async function home(req, res) { page: req.path, }) - const homeVariant = await SplitTestHandler.promises.getAssignment( - req, - res, - 'bs5-homepage' - ) - const isBS5page = homeVariant.variant === 'enabled' - - if (isBS5page) { - res.render('external/home/index') - } else { - res.render('external/home/bootstrap3/index') - } + res.render('external/home/index') } else { res.redirect('/login') } diff --git a/services/web/frontend/js/features/autoplay-video/index.js b/services/web/frontend/js/features/autoplay-video/index.js index 3811211194..d706f9058b 100644 --- a/services/web/frontend/js/features/autoplay-video/index.js +++ b/services/web/frontend/js/features/autoplay-video/index.js @@ -14,8 +14,7 @@ function setup(videoEl) { } const DELAY_BEFORE_REPLAY = 15 * 1000 - // 0.7 will enable the autoplay on the desktop main homepage video for users - // with the `new-design-registration` variant + // 0.7 will enable the autoplay on the desktop main homepage video for all users const INTERSECTION_THRESHOLD = 0.7 let videoIsVisible diff --git a/services/web/frontend/stylesheets/app/homepage.less b/services/web/frontend/stylesheets/app/homepage.less deleted file mode 100644 index faa5c0c7fe..0000000000 --- a/services/web/frontend/stylesheets/app/homepage.less +++ /dev/null @@ -1,284 +0,0 @@ -.universities { - text-align: center; - .uni-logo { - display: inline-block; - padding: 0 @padding-md; - width: 20%; - } -} - -@media only screen and (max-width: @screen-sm-max) { - .universities { - .uni-logo { - padding: @padding-md; - width: 50%; - } - } -} - -.website-redesign { - .home-animation-text-container { - padding-top: @header-height; - display: flex; - flex-direction: column; - align-items: center; - - .home-begin-text { - font-weight: 400; - display: flex; - color: #5f5ff0; - font-size: 4rem; - line-height: 1.25; - font-family: 'DM Mono', monospace; - align-self: flex-start; - width: 100%; - margin-top: 0; - font-weight: 400; - - @media (max-width: @screen-sm-max) { - text-align: center; - flex-direction: column; - align-items: center; - font-size: 2.25rem; - } - } - - .home-parenthesis-text { - color: #bbdbb8; - font-size: 4rem; - line-height: 1.25; - display: inherit; - - span { - /* specifity workaround, otherwise .website-redesign span would take precedence */ - font-family: 'DM Mono', monospace; - } - - #home-animation-text { - color: @neutral-70; - } - - @media (max-width: @screen-sm-max) { - font-size: 2.25rem; - } - } - } - - .home-top-text { - text-align: center; - font-size: 1.25rem; - line-height: 1.4; - margin-bottom: 0; - font-weight: 400; - - @media (max-width: @screen-sm-max) { - font-size: 1.125rem; - line-height: 1.33; - padding: 0 100px; - } - - @media (max-width: @screen-xs-max) { - padding: 0 20px; - } - - // force different line for desktop on both text - > span:first-of-type { - display: block; - - @media (max-width: @screen-sm-max) { - display: inline; - } - } - - // need to have an extra space only for mobile - // since on mobile all the text are inline - .dash-text { - @media (max-width: @screen-sm-max) { - &::after { - content: ' '; - } - } - } - } - - .home-registration { - display: flex; - flex-direction: column; - align-items: center; - margin-top: 20px; - - .home-registration-sso { - display: flex; - gap: 16px; - - @media (max-width: @screen-sm-max) { - flex-direction: column; - width: 100%; - } - - .form-group { - .hp-login-btn { - .login-btn; - - width: 100%; - min-width: 220px; - - .login-btn-icon { - position: absolute; - left: 6px; - top: 7px; - width: 20px; - height: 20px; - } - } - } - } - - .home-registration-separator { - margin: 8px 0; - color: @neutral-90; - - > span { - vertical-align: middle; - &::before, - &::after { - content: ''; - display: inline-block; - vertical-align: middle; - width: 196px; - height: 1px; - background-color: @neutral-20; - - @media (max-width: @screen-sm-max) { - flex-direction: column; - width: 100%; - width: 156px; - } - } - - &::before { - margin-right: 20px; - - @media (max-width: @screen-sm-max) { - margin-right: 5px; - } - } - - &::after { - margin-left: 20px; - - @media (max-width: @screen-sm-max) { - margin-left: 5px; - } - } - } - } - - .home-registration-password { - display: flex; - flex-direction: column; - - .home-registration-password-input { - display: flex; - flex-direction: row; - gap: 16px; - margin-bottom: 0; - } - - input { - flex: 1; - } - } - - .home-registration-sign-up { - display: block; - margin-top: 16px; - width: 100%; - margin-bottom: 0; - - > button { - width: 100%; - } - } - - .tos-agreement-notice { - font-size: 0.75rem; - } - } - - .home-millions-user-text { - text-align: center; - font-size: 1.25rem; - margin-bottom: 5px; - - @media (max-width: @screen-sm-max) { - font-size: 1rem; - } - } - - .home-university-logos { - display: flex; - justify-content: space-between; - flex-wrap: wrap; - - > img { - max-width: 145px; - } - - // 991px - @media (max-width: @screen-sm-max) { - justify-content: center; - gap: 50px; - } - } - - .home-templates-button-desktop { - @media (max-width: @screen-sm-max) { - display: none; - } - } - - .home-templates-button-mobile { - display: none; - @media (max-width: @screen-sm-max) { - display: block; - } - } - - .home-plans-footer { - text-align: center; - font-size: 1.125rem; - line-height: 1.333; - } - - #home-features-arrow-green { - position: absolute; - left: 154px; - top: -98px; - - @media (max-width: @screen-sm-max) { - height: 100px; - left: 120px; - top: -60px; - } - } - - #home-rocket-yellow { - position: absolute; - right: 30px; - - @media (max-width: @screen-md-max) { - height: 100px; - right: 30px; - bottom: -84px; - } - - @media (max-width: @screen-sm-max) { - height: 70px; - right: 0; - bottom: unset; - top: -79px; - margin-right: 10px; - } - } -} diff --git a/services/web/frontend/stylesheets/app/review-features-page.less b/services/web/frontend/stylesheets/app/review-features-page.less index 35e62f2d7c..b03256af50 100644 --- a/services/web/frontend/stylesheets/app/review-features-page.less +++ b/services/web/frontend/stylesheets/app/review-features-page.less @@ -467,3 +467,15 @@ opacity: 0; font-size: 0.5em; } +.rfp-universities { + text-align: center; + img { + display: inline-block; + padding: 0 @padding-md; + width: 20%; + @media only screen and (max-width: @screen-sm-max) { + padding: @padding-md; + width: 50%; + } + } +} diff --git a/services/web/frontend/stylesheets/main-style.less b/services/web/frontend/stylesheets/main-style.less index 3594633327..4e21bf1cfe 100644 --- a/services/web/frontend/stylesheets/main-style.less +++ b/services/web/frontend/stylesheets/main-style.less @@ -104,7 +104,6 @@ @import 'app/project-list.less'; @import 'app/project-list-react.less'; @import 'app/editor.less'; -@import 'app/homepage.less'; @import 'app/plans/plans-new-design.less'; @import 'app/recurly.less'; @import 'app/bonus.less';