From d0d1791b042ae766d62fa45d27b02b33715e0905 Mon Sep 17 00:00:00 2001 From: M Fahru Date: Fri, 15 Jul 2022 09:44:29 -0400 Subject: [PATCH] New plans page: Remove the "group admin" part of student table (#8881) GitOrigin-RevId: 3319891aa0f4c0bf0343a7a98e5f8e24c00925cd --- .../Features/Subscription/plansV2Features.js | 71 +------------------ .../frontend/stylesheets/app/plans-v2.less | 33 --------- 2 files changed, 1 insertion(+), 103 deletions(-) diff --git a/services/web/app/src/Features/Subscription/plansV2Features.js b/services/web/app/src/Features/Subscription/plansV2Features.js index d187a29e2b..cf1e8ad577 100644 --- a/services/web/app/src/Features/Subscription/plansV2Features.js +++ b/services/web/app/src/Features/Subscription/plansV2Features.js @@ -619,77 +619,8 @@ const studentPlans = [ }, ], }, - { - divider: true, - dividerLabel: 'group_admins_get_access_to', - dividerInfo: 'group_admins_get_access_to_info', - items: [ - { - feature: 'user_management', - info: 'user_management_info', - value: 'bool', - plans: { - free: false, - student: false, - }, - }, - { - feature: 'usage_metrics', - info: 'usage_metrics_info', - value: 'bool', - plans: { - free: false, - student: false, - }, - }, - { - feature: 'sso_integration', - info: 'sso_integration_info', - value: 'bool', - plans: { - free: false, - student: false, - }, - }, - { - feature: 'sitewide_option_available', - info: 'sitewide_option_available_info', - value: 'bool', - plans: { - free: false, - student: false, - }, - }, - { - feature: 'custom_resource_portal', - info: 'custom_resource_portal_info', - value: 'bool', - plans: { - free: false, - student: false, - }, - }, - { - feature: 'personalized_onboarding', - info: 'personalized_onboarding_info', - value: 'bool', - plans: { - free: false, - student: false, - }, - }, - { - feature: 'dedicated_account_manager', - info: 'dedicated_account_manager_info', - value: 'bool', - plans: { - free: false, - student: false, - }, - }, - ], - }, ] + module.exports = { individual: individualPlans, group: groupPlans, diff --git a/services/web/frontend/stylesheets/app/plans-v2.less b/services/web/frontend/stylesheets/app/plans-v2.less index d820d3fe71..bc312a51d7 100644 --- a/services/web/frontend/stylesheets/app/plans-v2.less +++ b/services/web/frontend/stylesheets/app/plans-v2.less @@ -496,39 +496,6 @@ span.plans-v2-license-picker-educational-discount-learn-more-container { } } -// This is a workaround. -// Table student have "Dedicated account manager" as its last feature. -// That name is long and it overflows to the next line, -// making the `td` is bigger than the inner `plans-v2-table-cell` (inner `div` class of most of the `td`). -// Since we can't make all `td` have fixed height -// (due to different text length that makes the -// `td` has variable height depending whether the text overflows), -// we need to force the last element of table student to have fixed height -// so the `border-bottom-right-radius` will work properly -// on the bottom right of the `plans-v2-table-student` (desktop only). -// To remove this workaround -// I think we need to change the whole table structure -// so it can support direct border-radius without inner div hack -// probably adding `border-collapse: separate` on the main table will do it, but need more research -// (we have `border-collapse: collapse` as the default from our normalize.less) -// example reference: https://stackoverflow.com/questions/4094126/how-to-add-border-radius-on-table-row -.plans-v2-table-student { - @media (min-width: @screen-md-min) { - tr:last-child td:nth-last-child(2) .plans-v2-table-cell { - height: 62px; - } - } - - @media (min-width: @screen-sm-min) { - tr:last-child td:nth-last-child(2) .plans-v2-table-cell { - height: 56px; - display: flex; - align-items: center; - justify-content: center; - } - } -} - .plans-v2-table-individual { tr { &:last-child {