From 330037884391a7ef07c0a83948a20275f9b7434a Mon Sep 17 00:00:00 2001
From: Peter Zimon <zimo@ghost.org>
Date: Tue, 17 Aug 2021 11:11:39 +0200
Subject: [PATCH] Refined single product signup desktop size UI

---
 ghost/portal/src/components/Frame.styles.js   |  2 +
 .../src/components/common/PlansSection.js     | 44 ++++++++++++-------
 .../src/components/common/ProductsSection.js  |  1 -
 .../portal/src/components/pages/SignupPage.js |  2 +-
 ghost/portal/src/utils/fixtures.js            |  2 +-
 ghost/portal/src/utils/helpers.js             |  3 +-
 6 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/ghost/portal/src/components/Frame.styles.js b/ghost/portal/src/components/Frame.styles.js
index ed2fbcfabb..becc12ef10 100644
--- a/ghost/portal/src/components/Frame.styles.js
+++ b/ghost/portal/src/components/Frame.styles.js
@@ -516,6 +516,8 @@ const FrameStyles = `
 
     /* Spacing modifiers
     /* ----------------------------------------------------- */
+    .gh-portal-strong { font-weight: 600; }
+
     .mt1 { margin-top: 4px; }
     .mt2 { margin-top: 8px; }
     .mt3 { margin-top: 12px; }
diff --git a/ghost/portal/src/components/common/PlansSection.js b/ghost/portal/src/components/common/PlansSection.js
index 90516d6445..1ffa7ca296 100644
--- a/ghost/portal/src/components/common/PlansSection.js
+++ b/ghost/portal/src/components/common/PlansSection.js
@@ -2,7 +2,7 @@ import React, {useContext} from 'react';
 import AppContext from '../../AppContext';
 import {ReactComponent as CheckmarkIcon} from '../../images/icons/checkmark.svg';
 import calculateDiscount from '../../utils/discount';
-import {isCookiesDisabled, formatNumber, hasOnlyFreePlan, hasMultipleProductsFeature, getFreeBenefits, getProductBenefits} from '../../utils/helpers';
+import {isCookiesDisabled, formatNumber, hasOnlyFreePlan, hasMultipleProductsFeature, getProductBenefits} from '../../utils/helpers';
 import ProductsSection, {ChangeProductSection} from './ProductsSection';
 
 export const PlanSectionStyles = `
@@ -23,7 +23,7 @@ export const PlanSectionStyles = `
         font-size: 1.4rem;
         line-height: 1.35em;
         border-right: 1px solid var(--grey11);
-        padding: 16px 10px;
+        padding: 24px 10px;
         cursor: pointer;
         user-select: none;
     }
@@ -107,7 +107,7 @@ export const PlanSectionStyles = `
         line-height: 1.0em;
         letter-spacing: 0.5px;
         text-transform: uppercase;
-        margin-top: 7px;
+        margin-top: 4px;
         text-align: center;
         min-height: 24px;
         word-break: break-word;
@@ -410,7 +410,7 @@ export const PlanSectionStyles = `
     }
 
     .gh-portal-singleproduct-benefits .gh-portal-product-benefit {
-        padding: 0 24px;
+        padding: 0 8px;
     }
 
     .gh-portal-singleproduct-benefits .gh-portal-product-description {
@@ -418,12 +418,21 @@ export const PlanSectionStyles = `
         margin-bottom: 14px !important;
     }
 
+    .gh-portal-singleproduct-benefits:not(.free) .gh-portal-product-description {
+        border-bottom: 1px solid var(--grey11);
+        padding-bottom: 20px;
+        margin-bottom: 20px !important;
+    }
+
     .gh-portal-singleproduct-benefits .gh-portal-product-benefit:last-of-type {
         margin-bottom: 12px;
     }
 
-    .gh-portal-singleproduct-benefits.default-benefits {
-        align-items: center;
+    .gh-portal-discount-label {
+        color: var(--brandcolor);
+        font-size: 1.2rem;
+        margin-top: 4px;
+        margin-bottom: -12px;
     }
 
     @media (max-width: 480px) {
@@ -510,6 +519,7 @@ function PlanOptions({plans, selectedPlan, onPlanSelect, changePlan}) {
                 <Checkbox name={name} id={id} isChecked={isChecked} onPlanSelect={onPlanSelect} />
                 <h4 className={planNameClass}>{displayName}</h4>
                 <PriceLabel currencySymbol={currencySymbol} price={price} interval={interval} />
+                {(hasMultipleProductsFeature({site}) ? <PlanDiscount discount={description} /> : ``)}
                 <div className={featureClass}>
                     <PlanFeature feature={planDetails.feature} />
                     {(changePlan && selectedPlan === id ? <span className='gh-portal-plan-current'>Current plan</span> : '')}
@@ -519,6 +529,12 @@ function PlanOptions({plans, selectedPlan, onPlanSelect, changePlan}) {
     });
 }
 
+function PlanDiscount({discount}) {
+    return (
+        <div className="gh-portal-discount-label">{discount}</div>
+    );
+}
+
 function PlanFeature({feature, hide = false}) {
     if (hide) {
         return null;
@@ -537,7 +553,7 @@ function PlanBenefit({benefit}) {
     return (
         <div className="gh-portal-product-benefit">
             <CheckmarkIcon className='gh-portal-benefit-checkmark' />
-            {benefit.name}
+            <span className={benefit.className}>{benefit.name}</span>
         </div>
     );
 }
@@ -551,16 +567,13 @@ function PlanBenefits({product, plans, selectedPlan}) {
     let planBenefits = [];
     let planDescription = product.description;
     if (selectedPlan === 'free') {
-        planBenefits = getFreeBenefits();
-        planDescription = `Free preview`;
+        planBenefits = [];
+        planDescription = `Free preview of ` + site.title;
     } else if (plan?.interval === 'month') {
         planBenefits = productBenefits.monthly;
     } else if (plan?.interval === 'year') {
         planBenefits = productBenefits.yearly;
     }
-    if (!planBenefits?.length) {
-        return null;
-    }
     const benefits = planBenefits.map((benefit, idx) => {
         const key = `${benefit.name}-${idx}`;
         return (
@@ -568,9 +581,10 @@ function PlanBenefits({product, plans, selectedPlan}) {
         );
     });
 
-    const benefitContainerClass = !product?.benefits?.length || planBenefits.length <= 1 ? 'default-benefits' : '';
+    const benefitsClass = (selectedPlan === 'free') ? `free` : ``;
+
     return (
-        <div className={'gh-portal-singleproduct-benefits gh-portal-product-benefits ' + benefitContainerClass}>
+        <div className={'gh-portal-singleproduct-benefits gh-portal-product-benefits ' + benefitsClass}>
             {(product.description ? <div className='gh-portal-product-description'> {planDescription} </div> : '')}
             {benefits}
         </div>
@@ -650,7 +664,7 @@ export function SingleProductPlansSection({product, plans, selectedPlan, onPlanS
     const className = getPlanClassNames({cookiesDisabled, changePlan, plans, site});
 
     return (
-        <section className="gh-portal-plans">
+        <section className="gh-portal-plans mt8">
             <div className={className}>
                 <PlanOptions plans={plans} onPlanSelect={onPlanSelect} selectedPlan={selectedPlan} changePlan={changePlan} />
             </div>
diff --git a/ghost/portal/src/components/common/ProductsSection.js b/ghost/portal/src/components/common/ProductsSection.js
index fad30f4b45..0cbaa75e15 100644
--- a/ghost/portal/src/components/common/ProductsSection.js
+++ b/ghost/portal/src/components/common/ProductsSection.js
@@ -271,7 +271,6 @@ export const ProductsSectionStyles = ({site}) => {
             .gh-portal-product-description {
                 grid-column: 2 / 3;
                 margin-bottom: 0px;
-                text-align: left;
             }
 
             .gh-portal-product-price {
diff --git a/ghost/portal/src/components/pages/SignupPage.js b/ghost/portal/src/components/pages/SignupPage.js
index a105f86b4e..a1a96b182d 100644
--- a/ghost/portal/src/components/pages/SignupPage.js
+++ b/ghost/portal/src/components/pages/SignupPage.js
@@ -77,7 +77,7 @@ export const SignupPageStyles = `
         background: linear-gradient(#fff 30%,hsla(0,0%,100%,0)),
                     linear-gradient(hsla(0,0%,100%,0),#fff 70%) 0 100%,
                     linear-gradient(#fff,transparent),
-                    linear-gradient(transparent,rgba(0,0,0,.08)) 0 100%;
+                    linear-gradient(transparent,rgba(0,0,0,.03)) 0 100%;
         background-repeat: no-repeat;
         background-color: #fff;
         background-size: 100% 40px,100% 40px,100% 14px,100% 14px;
diff --git a/ghost/portal/src/utils/fixtures.js b/ghost/portal/src/utils/fixtures.js
index 648fb9fc4f..698fb201e3 100644
--- a/ghost/portal/src/utils/fixtures.js
+++ b/ghost/portal/src/utils/fixtures.js
@@ -150,7 +150,7 @@ const products = [
 ];
 
 export const site = {
-    title: 'A Ghost site',
+    title: 'The Blueprint',
     description: 'Thoughts, stories and ideas.',
     logo: 'https://static.ghost.org/v4.0.0/images/ghost-orb-1.png',
     icon: 'https://static.ghost.org/v4.0.0/images/ghost-orb-1.png',
diff --git a/ghost/portal/src/utils/helpers.js b/ghost/portal/src/utils/helpers.js
index 7a819b82ae..5e38b8f31e 100644
--- a/ghost/portal/src/utils/helpers.js
+++ b/ghost/portal/src/utils/helpers.js
@@ -263,7 +263,8 @@ export function getProductBenefits({product, site = null}) {
         const yearlyBenefits = [...monthlyBenefits];
         if (yearlyDiscount > 0 && availablePrices.length > 1) {
             yearlyBenefits.push({
-                name: `${yearlyDiscount}% discount`
+                name: `${yearlyDiscount}% annual discount`,
+                className: `gh-portal-strong`
             });
         }
         return {