diff --git a/ghost/portal/src/App.js b/ghost/portal/src/App.js index 5afd27302b..2af017d87c 100644 --- a/ghost/portal/src/App.js +++ b/ghost/portal/src/App.js @@ -19,7 +19,7 @@ const DEV_MODE_DATA = { showPopup: true, site: Fixtures.site, member: Fixtures.member.paid, - page: 'accountHome' + page: 'signup' }; function SentryErrorBoundary({site, children}) { diff --git a/ghost/portal/src/components/common/PlansSection.js b/ghost/portal/src/components/common/PlansSection.js index dec5e5efb3..9ef70c4bf2 100644 --- a/ghost/portal/src/components/common/PlansSection.js +++ b/ghost/portal/src/components/common/PlansSection.js @@ -364,8 +364,12 @@ export const PlanSectionStyles = ` } .gh-portal-plans-container.has-multiple-products.is-change-plan { - border-top-left-radius: 0; - border-top-right-radius: 0; + border-radius: 0 0 5px 5px; + border-top: none; + } + + .gh-portal-plans-container.has-multiple-products.is-change-plan .gh-portal-plan-section { + min-height: 90px; } .gh-portal-plan-product { @@ -387,7 +391,7 @@ export const PlanSectionStyles = ` border-bottom: 1px solid var(--grey12); } - .gh-portal-accountplans-main .gh-portal-plan-section:hover { + .gh-portal-accountplans-main .gh-portal-plan-section:hover:not(.checked) { background: var(--grey14); } @@ -628,7 +632,6 @@ export function SingleProductPlansSection({product, plans, selectedPlan, onPlanS return (
-
diff --git a/ghost/portal/src/components/common/ProductsSection.js b/ghost/portal/src/components/common/ProductsSection.js index 310c7b017e..8b3c415b9f 100644 --- a/ghost/portal/src/components/common/ProductsSection.js +++ b/ghost/portal/src/components/common/ProductsSection.js @@ -126,7 +126,7 @@ export const ProductsSectionStyles = ({site}) => { } .gh-portal-product-name { - font-size: 1.2rem; + font-size: 1.3rem; font-weight: 500; line-height: 1.45em; letter-spacing: 0.5px; @@ -136,6 +136,7 @@ export const ProductsSectionStyles = ({site}) => { min-height: 24px; word-break: break-word; width: 100%; + color: var(--grey1); border-bottom: 1px solid var(--grey12); padding: 8px 0 16px; margin-bottom: 12px; @@ -220,6 +221,10 @@ export const ProductsSectionStyles = ({site}) => { display: none !important; } + .gh-portal-products-grid.change-plan { + padding: 0; + } + @media (max-width: 480px) { .gh-portal-products { margin: 0 -32px; @@ -324,9 +329,16 @@ export const ProductsSectionStyles = ({site}) => { .gh-portal-upgrade-product .gh-portal-products-grid { grid-template-columns: unset; grid-gap: 20px; - padding: 32px 0 0; width: 100%; } + + .gh-portal-upgrade-product .gh-portal-products-grid:not(.change-plan) { + padding: 32px 0 0; + } + + .gh-portal-upgrade-product .gh-portal-products-grid.change-plan .gh-portal-product-card { + cursor: auto; + } .gh-portal-upgrade-product .gh-portal-products-priceswitch { padding-top: 18px; @@ -340,7 +352,7 @@ export const ProductsSectionStyles = ({site}) => { min-height: 68px; padding: 12px 20px; background: none; - border: 1px solid var(--grey12); + border: 1px solid var(--grey11); box-shadow: none; } @@ -360,6 +372,7 @@ export const ProductsSectionStyles = ({site}) => { .gh-portal-upgrade-product .gh-portal-product-description { grid-column: 2 / 3; + grid-row: 2; margin-bottom: 0px; text-align: left; } @@ -409,6 +422,19 @@ export const ProductsSectionStyles = ({site}) => { .gh-portal-upgrade-product .gh-portal-product-benefit:last-of-type { margin-bottom: 0; } + + .gh-portal-products-grid.change-plan .gh-portal-product-card-header { + grid-template-columns: auto; + grid-column: 1 / 3; + } + + .gh-portal-products-grid.change-plan .gh-portal-product-name { + font-weight: 600; + } + + .gh-portal-products-grid.change-plan .gh-portal-product-description { + grid-column: 1; + } `; }; @@ -687,9 +713,7 @@ function ChangeProductCard({product, onPlanSelect}) { return (
-
+

{product.name}