agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-05-25 02:00:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26749 from overleaf/mf-tear-down-plans-page-bs5

Browse Source 
[web] Tear down plans-page-bs5 and make the bs5 version the default version

GitOrigin-RevId: 6a4d8c8a75597bbda23057f8ca404cf6c5e1f428
This commit is contained in:
M Fahru
2025-07-09 08:12:30 -07:00
committed by Copybot
parent 56998dfcd6
commit 92e55edf08
6 changed files with 5 additions and 1523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/web/app/views/layout-website-redesign.pug
View File

@@ -15,8 +15,6 @@ block body
block content
//- bootstrapVersion needed here, because plans.pug uses both BS version
//- If the `plans-page-bs5` split test has been completed, remove bootstrapVersion logic
if typeof suppressFooter == 'undefined'
if showThinFooter
if bootstrapVersion === 5

25
services/web/app/views/subscriptions/plans/_faq_new.pug
View File

@@ -14,30 +14,15 @@ include ../../_mixins/material_symbol
.row
.col-xs-12
div(
class={
'plans-faq-tabs': bootstrapVersion === 5,
'ol-tabs': bootstrapVersion === 5,
'ol-tabs-scrollable': bootstrapVersion === 3,
}
)
.ol-tabs.plans-faq-tabs
.nav-tabs-container
ul.nav.nav-tabs(role='tablist')
//- In the bs5 version of plans page, the `active` class need to be added to the `a` tag instead of the parent `li` tag
//- If the `plans-page-bs5` split test has been completed, remove the `active` class from the `li` tag since we're not using it anymore
//- If the `plans-page-bs5` split test has been completed, remove the `data-toggle` because it is not needed anymore (bs5 uses `data-bs-toggle`)
li(role='presentation' class={
active: bootstrapVersion === 3,
})
a(
li(role='presentation')
a.active(
role='tab'
data-toggle='tab'
data-bs-toggle='tab'
href='#' + managingYourSubscription
aria-controls=managingYourSubscription
class={
active: bootstrapVersion === 5,
}
)
| #{translate('managing_your_subscription')}
li(role='presentation')
@@ -72,8 +57,8 @@ include ../../_mixins/material_symbol
span #{translate('still_have_questions')}
button(
data-ol-open-contact-form-modal='general'
data-bs-toggle=bootstrapVersion === 5 ? 'modal' : undefined
data-bs-target=bootstrapVersion === 5 ? '#contactUsModal' : undefined
data-bs-toggle='modal'
data-bs-target='#contactUsModal'
)
span(style='margin-right: 4px') #{translate('contact_support')}
+material-symbol-rounded('arrow_right_alt', 'icon-md')

33
services/web/app/views/subscriptions/plans/_plans_faq_tabs.pug
View File

@@ -1,4 +1,3 @@
//- If the `plans-page-bs5` split test has been completed, remove the `data-toggle` and `data-target` because it is not needed anymore (bs5 uses `data-bs-toggle` and `data-bs-target`)
include ../../_mixins/material_symbol
mixin managingYourSubscription
@@ -6,8 +5,6 @@ mixin managingYourSubscription
.custom-accordion-item
button.custom-accordion-header.collapsed(
type='button'
data-toggle='collapse'
data-target='#managingYourSubscriptionQ1'
data-bs-toggle='collapse'
data-bs-target='#managingYourSubscriptionQ1'
aria-expanded='false'
@@ -24,8 +21,6 @@ mixin managingYourSubscription
.custom-accordion-item
button.custom-accordion-header.collapsed(
type='button'
data-toggle='collapse'
data-target='#managingYourSubscriptionQ2'
data-bs-toggle='collapse'
data-bs-target='#managingYourSubscriptionQ2'
aria-expanded='false'
@@ -40,8 +35,6 @@ mixin managingYourSubscription
.custom-accordion-item
button.custom-accordion-header.collapsed(
type='button'
data-toggle='collapse'
data-target='#managingYourSubscriptionQ3'
data-bs-toggle='collapse'
data-bs-target='#managingYourSubscriptionQ3'
aria-expanded='false'
@@ -56,8 +49,6 @@ mixin managingYourSubscription
.custom-accordion-item
button.custom-accordion-header.collapsed(
type='button'
data-toggle='collapse'
data-target='#managingYourSubscriptionQ4'
data-bs-toggle='collapse'
data-bs-target='#managingYourSubscriptionQ4'
aria-expanded='false'
@@ -85,8 +76,6 @@ mixin overleafIndividualPlans
.custom-accordion-item
button.custom-accordion-header.collapsed(
type='button'
data-toggle='collapse'
data-target='#overleafIndividualPlansQ1'
data-bs-toggle='collapse'
data-bs-target='#overleafIndividualPlansQ1'
aria-expanded='false'
@@ -114,8 +103,6 @@ mixin overleafIndividualPlans
.custom-accordion-item
button.custom-accordion-header.collapsed(
type='button'
data-toggle='collapse'
data-target='#overleafIndividualPlansQ2'
data-bs-toggle='collapse'
data-bs-target='#overleafIndividualPlansQ2'
aria-expanded='false'
@@ -131,8 +118,6 @@ mixin overleafIndividualPlans
.custom-accordion-item
button.custom-accordion-header.collapsed(
type='button'
data-toggle='collapse'
data-target='#overleafIndividualPlansQ3'
data-bs-toggle='collapse'
data-bs-target='#overleafIndividualPlansQ3'
aria-expanded='false'
@@ -149,8 +134,6 @@ mixin overleafIndividualPlans
.custom-accordion-item
button.custom-accordion-header.collapsed(
type='button'
data-toggle='collapse'
data-target='#overleafIndividualPlansQ4'
data-bs-toggle='collapse'
data-bs-target='#overleafIndividualPlansQ4'
aria-expanded='false'
@@ -167,8 +150,6 @@ mixin overleafIndividualPlans
.custom-accordion-item
button.custom-accordion-header.collapsed(
type='button'
data-toggle='collapse'
data-target='#overleafIndividualPlansQ5'
data-bs-toggle='collapse'
data-bs-target='#overleafIndividualPlansQ5'
aria-expanded='false'
@@ -183,8 +164,6 @@ mixin overleafIndividualPlans
.custom-accordion-item
button.custom-accordion-header.collapsed(
type='button'
data-toggle='collapse'
data-target='#overleafIndividualPlansQ6'
data-bs-toggle='collapse'
data-bs-target='#overleafIndividualPlansQ6'
aria-expanded='false'
@@ -199,8 +178,6 @@ mixin overleafIndividualPlans
.custom-accordion-item
button.custom-accordion-header.collapsed(
type='button'
data-toggle='collapse'
data-target='#overleafIndividualPlansQ7'
data-bs-toggle='collapse'
data-bs-target='#overleafIndividualPlansQ7'
aria-expanded='false'
@@ -218,8 +195,6 @@ mixin overleafGroupPlans
.custom-accordion-item
button.custom-accordion-header.collapsed(
type='button'
data-toggle='collapse'
data-target='#overleafGroupPlansQ1'
data-bs-toggle='collapse'
data-bs-target='#overleafGroupPlansQ1'
aria-expanded='false'
@@ -235,8 +210,6 @@ mixin overleafGroupPlans
.custom-accordion-item
button.custom-accordion-header.collapsed(
type='button'
data-toggle='collapse'
data-target='#overleafGroupPlansQ2'
data-bs-toggle='collapse'
data-bs-target='#overleafGroupPlansQ2'
aria-expanded='false'
@@ -261,8 +234,6 @@ mixin overleafGroupPlans
.custom-accordion-item
button.custom-accordion-header.collapsed(
type='button'
data-toggle='collapse'
data-target='#overleafGroupPlansQ3'
data-bs-toggle='collapse'
data-bs-target='#overleafGroupPlansQ3'
aria-expanded='false'
@@ -277,8 +248,6 @@ mixin overleafGroupPlans
.custom-accordion-item
button.custom-accordion-header.collapsed(
type='button'
data-toggle='collapse'
data-target='#overleafGroupPlansQ4'
data-bs-toggle='collapse'
data-bs-target='#overleafGroupPlansQ4'
aria-expanded='false'
@@ -328,8 +297,6 @@ mixin overleafGroupPlans
.custom-accordion-item
button.custom-accordion-header.collapsed(
type='button'
data-toggle='collapse'
data-target='#overleafGroupPlansQ5'
data-bs-toggle='collapse'
data-bs-target='#overleafGroupPlansQ5'
aria-expanded='false'

1425
services/web/frontend/stylesheets/app/plans.less
View File

File diff suppressed because it is too large Load Diff

42
services/web/frontend/stylesheets/core/grid.less
View File

@@ -74,45 +74,3 @@
@media (min-width: @screen-lg-min) {
.make-grid(lg);
}
.website-redesign {
// whitelist for the pages to use the new grid
// TODO: remove this whitelist once all pages are using the new grid
.plans-new-design,
.plans-page {
// Container widths
//
// Set the container width, and override it for fixed navbars in media queries.
.container {
.container-fixed(@grid-gutter-width-new);
@media (min-width: @screen-sm-min) {
width: @container-sm;
}
@media (min-width: @screen-md-min) {
width: @container-md;
}
@media (min-width: @screen-lg-min) {
width: @container-lg;
}
@media (min-width: @screen-xl-min) {
width: @container-xl;
}
}
// Row
//
// Rows contain and clear the floats of your columns.
.row {
.make-row(@grid-gutter-width-new);
}
// Columns
//
// Common styles for small and large grid columns
.make-grid-columns(@grid-gutter-width-new);
}
}

1
services/web/frontend/stylesheets/main-style.less
View File

@@ -101,7 +101,6 @@
@import 'app/project-list.less';
@import 'app/project-list-react.less';
@import 'app/editor.less';
@import 'app/plans.less';
@import 'app/recurly.less';
@import 'app/bonus.less';
@import 'app/blog.less';