From edacb9ec0b2a79e04676488d6a5d7ff5e72b44cd Mon Sep 17 00:00:00 2001 From: Antoine Clausse Date: Tue, 3 Jun 2025 13:57:29 +0200 Subject: [PATCH] Merge pull request #26111 from overleaf/revert-25937-ac-bs5-general-pug-pages Revert "[web] Migrate general Pug pages to BS5" GitOrigin-RevId: fcc42ee28004aa55c09ecbd5f5e96c6067e717e9 --- services/web/app/views/general/400.pug | 43 ++++++----- services/web/app/views/general/404.pug | 15 ++-- services/web/app/views/general/500.pug | 34 +++++---- services/web/app/views/general/closed.pug | 8 +- .../app/views/general/unsupported-browser.pug | 76 ++++++++++--------- .../web/app/views/layout/layout-no-js.pug | 2 +- .../stylesheets/bootstrap-5/pages/all.scss | 1 - .../bootstrap-5/pages/error-pages.scss | 7 -- 8 files changed, 93 insertions(+), 93 deletions(-) delete mode 100644 services/web/frontend/stylesheets/bootstrap-5/pages/error-pages.scss diff --git a/services/web/app/views/general/400.pug b/services/web/app/views/general/400.pug index 26aeeb778a..9fc97823c5 100644 --- a/services/web/app/views/general/400.pug +++ b/services/web/app/views/general/400.pug @@ -2,27 +2,30 @@ extends ../layout/layout-no-js block vars - metadata = { title: 'Something went wrong' } + - bootstrap5PageStatus = 'disabled' block body - body - main.content.content-alt#main-content - .container - .error-container - h1.mb-4 Something went wrong, sorry. - p.fs-5 - | There was a problem with your request. + body.full-height + main.content.content-alt.full-height#main-content + .container.full-height + .error-container.full-height + .error-details + p.error-status Something went wrong, sorry. + p.error-description + | There was a problem with your request. + if(message) + | + | The error is: if(message) + p.error-box + | #{message} + p.error-description + | Please go back and try again. + | If the problem persists, please contact us at | - | The error is: - if(message) - p.bg-light.p-3.border-2.font-monospace - | #{message} - p.fs-5 - | Please go back and try again. - | If the problem persists, please contact us at - | - a(href="mailto:" + settings.adminEmail) #{settings.adminEmail} - | . - p.mt-5.d-flex.gap-3 - a.btn.btn-primary(href="javascript:history.back()") Back - a.btn.btn-secondary(href="/") Home + a(href="mailto:" + settings.adminEmail) #{settings.adminEmail} + | . + p.error-actions + a.error-btn(href="javascript:history.back()") Back + |   + a.btn.btn-secondary(href="/") Home diff --git a/services/web/app/views/general/404.pug b/services/web/app/views/general/404.pug index 42b0a44932..f4b5800cf2 100644 --- a/services/web/app/views/general/404.pug +++ b/services/web/app/views/general/404.pug @@ -1,13 +1,14 @@ -extends ../layout-react +extends ../layout-marketing -block append meta - meta(name="ol-user" data-type="json" content=user) +block vars + - bootstrap5PageStatus = 'disabled' block content main.content.content-alt#main-content .container .error-container - h1.mb-4 Not found - p.fs-5 #{translate("cant_find_page")} - p.mt-5 - a.btn.btn-primary.d-block.d-md-inline-block(href="/") Home + .error-details + p.error-status Not found + p.error-description #{translate("cant_find_page")} + p.error-actions + a.error-btn(href="/") Home diff --git a/services/web/app/views/general/500.pug b/services/web/app/views/general/500.pug index 32dfb27a58..90cb1e3606 100644 --- a/services/web/app/views/general/500.pug +++ b/services/web/app/views/general/500.pug @@ -2,21 +2,23 @@ extends ../layout/layout-no-js block vars - metadata = { title: 'Something went wrong' } + - bootstrap5PageStatus = 'disabled' block body - body - main.content.content-alt#main-content - .container - .error-container - h1.mb-4 Something went wrong, sorry. - p.fs-5 Our staff are probably looking into this, but if it continues, please check our status page at - | - | - a(href="http://" + settings.statusPageUrl) #{settings.statusPageUrl} - | - | or contact us at - | - a(href="mailto:" + settings.adminEmail) #{settings.adminEmail} - | . - p.mt-5 - a.btn.btn-primary.d-block.d-md-inline-block(href="/") Home + body.full-height + main.content.content-alt.full-height#main-content + .container.full-height + .error-container.full-height + .error-details + p.error-status Something went wrong, sorry. + p.error-description Our staff are probably looking into this, but if it continues, please check our status page at + | + | + a(href="http://" + settings.statusPageUrl) #{settings.statusPageUrl} + | + | or contact us at + | + a(href="mailto:" + settings.adminEmail) #{settings.adminEmail} + | . + p.error-actions + a.error-btn(href="/") Home diff --git a/services/web/app/views/general/closed.pug b/services/web/app/views/general/closed.pug index 0d10a84476..f4012997bd 100644 --- a/services/web/app/views/general/closed.pug +++ b/services/web/app/views/general/closed.pug @@ -1,13 +1,13 @@ -extends ../layout-react +extends ../layout-marketing -block append meta - meta(name="ol-user" data-type="json" content=user) +block vars + - bootstrap5PageStatus = 'disabled' block content main.content#main-content .container .row - .col-lg-8.offset-lg-2.text-center + .col-md-8.col-md-offset-2.text-center .page-header h1 Maintenance p diff --git a/services/web/app/views/general/unsupported-browser.pug b/services/web/app/views/general/unsupported-browser.pug index 84e1f8f55e..f8806cf8d2 100644 --- a/services/web/app/views/general/unsupported-browser.pug +++ b/services/web/app/views/general/unsupported-browser.pug @@ -2,43 +2,45 @@ extends ../layout/layout-no-js block vars - metadata = { title: 'Unsupported browser' } + - bootstrap5PageStatus = 'disabled' block body - body - main.content.content-alt#main-content - .container - .error-container - h1.mb-4 Unsupported Browser - p.fs-5 - | Sorry, we don't support your browser anymore. Please see below what browsers we support. - br - | If you think you're seeing this message in error, - | - a(href="mailto:" + settings.adminEmail) please let us know - | . - - if fromURL - p - | URL: + body.full-height + main.content.content-alt.full-height#main-content + .container.full-height + .error-container.full-height + .error-details + h1.error-status Unsupported Browser + p.error-description + | Sorry, we don't support your browser anymore. Please see below what browsers we support. + br + | If you think you're seeing this message in error, | - a(href=fromURL) #{fromURL} - - hr - - p - | Overleaf officially supports versions of Chrome, Firefox, Safari and Microsoft Edge released in the last 12 months. - br - | Firefox ESR is also supported for 12 months. - p - | Support for beta or developer-preview browser versions cannot be guaranteed. Please - | - a(href="mailto:" + settings.adminEmail) get in touch - | - | if you encounter any issues while using the service with beta or developer-preview releases of supported browsers. - p - strong Overleaf has stopped supporting Internet Explorer as of April 26, 2021, and access is now blocked. - p - | If you cannot upgrade to one of the supported browsers, - | - a(href="mailto:" + settings.adminEmail) please let us know - | . + a(href="mailto:" + settings.adminEmail) please let us know + | . + + if fromURL + p + | URL: + | + a(href=fromURL) #{fromURL} + + hr + + p + | Overleaf officially supports versions of Chrome, Firefox, Safari and Microsoft Edge released in the last 12 months. + br + | Firefox ESR is also supported for 12 months. + p + | Support for beta or developer-preview browser versions cannot be guaranteed. Please + | + a(href="mailto:" + settings.adminEmail) get in touch + | + | if you encounter any issues while using the service with beta or developer-preview releases of supported browsers. + p + strong Overleaf has stopped supporting Internet Explorer as of April 26, 2021, and access is now blocked. + p + | If you cannot upgrade to one of the supported browsers, + | + a(href="mailto:" + settings.adminEmail) please let us know + | . diff --git a/services/web/app/views/layout/layout-no-js.pug b/services/web/app/views/layout/layout-no-js.pug index b5bf3cc434..c86721a810 100644 --- a/services/web/app/views/layout/layout-no-js.pug +++ b/services/web/app/views/layout/layout-no-js.pug @@ -13,6 +13,6 @@ html(lang="en") link(rel="icon", href="/favicon.ico") if buildCssPath - link(rel="stylesheet", href=buildCssPath('', 5)) + link(rel="stylesheet", href=buildCssPath()) block body diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/all.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/all.scss index f10f00842d..a3adc98819 100644 --- a/services/web/frontend/stylesheets/bootstrap-5/pages/all.scss +++ b/services/web/frontend/stylesheets/bootstrap-5/pages/all.scss @@ -37,7 +37,6 @@ @import 'editor/math-preview'; @import 'editor/references-search'; @import 'editor/editor-survey'; -@import 'error-pages'; @import 'website-redesign'; @import 'group-settings'; @import 'templates-v2'; diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/error-pages.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/error-pages.scss deleted file mode 100644 index e68f675aa0..0000000000 --- a/services/web/frontend/stylesheets/bootstrap-5/pages/error-pages.scss +++ /dev/null @@ -1,7 +0,0 @@ -.error-container { - padding: var(--spacing-08); - - @include media-breakpoint-up(lg) { - padding: var(--spacing-08) var(--spacing-11); - } -}