diff --git a/ghost/portal/src/App.js b/ghost/portal/src/App.js index 5c290fbe32..d1df902627 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: 'signup' + page: 'accountPlan' }; export default class App extends React.Component { constructor(props) { diff --git a/ghost/portal/src/components/Global.styles.js b/ghost/portal/src/components/Global.styles.js index 57a6a88f95..490e7c6fa8 100644 --- a/ghost/portal/src/components/Global.styles.js +++ b/ghost/portal/src/components/Global.styles.js @@ -17,6 +17,7 @@ export const GlobalStyles = ` --grey11: #e1e1e1; --grey12: #eaeaea; --grey13: #f9f9f9; + --grey14: #fbfbfb; --white: #fff; --red: #f02525; --yellow: #FFDC15; diff --git a/ghost/portal/src/components/common/PlansSection.js b/ghost/portal/src/components/common/PlansSection.js index 86e40f8078..e4b4716125 100644 --- a/ghost/portal/src/components/common/PlansSection.js +++ b/ghost/portal/src/components/common/PlansSection.js @@ -7,7 +7,7 @@ export const PlanSectionStyles = ` .gh-portal-plans-container { display: flex; align-items: stretch; - border: 1px solid var(--grey10); + border: 1px solid var(--grey11); border-radius: 5px; } @@ -20,7 +20,7 @@ export const PlanSectionStyles = ` justify-items: center; font-size: 1.4rem; line-height: 1.35em; - border-right: 1px solid var(--grey10); + border-right: 1px solid var(--grey11); padding: 16px 10px; cursor: pointer; user-select: none; @@ -244,7 +244,7 @@ export const PlanSectionStyles = ` letter-spacing: 0.2px; line-height: 1.25em; color: var(--brandcolor); - margin: 4px 0 -2px; + margin: 3px 0 -2px; } .gh-portal-plans-container.vertical { @@ -259,7 +259,7 @@ export const PlanSectionStyles = ` justify-items: start; min-height: 60px; border-right: none; - border-bottom: 1px solid var(--grey10); + border-bottom: 1px solid var(--grey11); padding: 10px; } @@ -294,7 +294,7 @@ export const PlanSectionStyles = ` } .gh-portal-plans-container.vertical .gh-portal-plan-featurewrapper { - margin: 0; + margin: 4px 0 0; padding: 0; border: none; align-items: flex-start; @@ -332,6 +332,37 @@ export const PlanSectionStyles = ` .gh-portal-plans-container.vertical .gh-portal-plan-name.no-description { grid-row: 1 / 3; } + + .gh-portal-plans-container.multiple-products { + border: none; + } + + .gh-portal-plan-product { + border: 1px solid var(--grey11); + border-radius: 5px; + } + + .gh-portal-plan-product:not(:last-of-type) { + margin-bottom: 20px; + } + + .gh-portal-plan-productname { + border-radius: 5px 5px 0 0; + padding: 2px 10px; + font-size: 1.25rem; + letter-spacing: 0.3px; + text-transform: uppercase; + font-weight: 600; + border-bottom: 1px solid var(--grey12); + } + + .gh-portal-accountplans-main .gh-portal-plan-section:hover { + background: var(--grey14); + } + + .gh-portal-accountplans-main .gh-portal-plan-section:last-of-type { + border-radius: 0 0 5px 5px; + } `; function Checkbox({name, id, onPlanSelect, isChecked, disabled = false}) { @@ -385,15 +416,8 @@ function addDiscountToPlans(plans) { function ProductOptions({products, selectedPlan, onPlanSelect, changePlan}) { return products.map(({id, monthlyPrice, yearlyPrice, name}) => { return ( -