diff --git a/ghost/portal/src/App.js b/ghost/portal/src/App.js index 8e63a19fca..43ce8cb0e3 100644 --- a/ghost/portal/src/App.js +++ b/ghost/portal/src/App.js @@ -142,8 +142,8 @@ export default class App extends React.Component { return { showPopup: true, site: Fixtures.site, - member: Fixtures.member.free, - page: 'signup' + member: Fixtures.member.paid, + page: 'accountHome' }; } return {}; diff --git a/ghost/portal/src/components/common/Switch.js b/ghost/portal/src/components/common/Switch.js index 33c6fe52b7..38b0f02547 100644 --- a/ghost/portal/src/components/common/Switch.js +++ b/ghost/portal/src/components/common/Switch.js @@ -30,8 +30,8 @@ export const SwitchStyles = ` left: 0; right: 0; bottom: 0; - background: #e5eff5; - border: 1px solid #dae8f1; + background: #f4f4f4; + border: 1px solid #e4e4e4; transition: .3s; width: 50px !important; height: 28px !important; @@ -47,23 +47,24 @@ export const SwitchStyles = ` .gh-portal-for-switch .input-toggle-component:before { position: absolute; content: ""; - height: 22px !important; - width: 22px !important; + height: 24px !important; + width: 24px !important; left: 2px !important; top: 2px !important; background-color: white; transition: .3s; - box-shadow: 0 0 1px rgba(0,0,0,.6), 0 2px 3px rgba(0,0,0,.2); + box-shadow: 0 0 1px rgba(0,0,0,.3), 0 4px 6px rgba(0,0,0,.1); border-radius: 999px; } .gh-portal-for-switch input:checked + .input-toggle-component { - background: #a4d037; + background: var(--brandcolor); border-color: transparent; } .gh-portal-for-switch input:checked + .input-toggle-component:before { transform: translateX(22px); + box-shadow: none; } .gh-portal-for-switch .container { diff --git a/ghost/portal/src/components/pages/AccountHomePage.js b/ghost/portal/src/components/pages/AccountHomePage.js index 0bca748b29..678693cb36 100644 --- a/ghost/portal/src/components/pages/AccountHomePage.js +++ b/ghost/portal/src/components/pages/AccountHomePage.js @@ -67,7 +67,7 @@ export const AccountHomePageStyles = ` .gh-portal-accountdetail-data { line-height: 1em; - margin-top: 4px; + margin-top: 2px; color: #777; } @@ -281,9 +281,7 @@ class PaidAccountHomePage extends React.Component {

Plan

-
-
{this.getPlanLabel(plan)}
-
+
{this.getPlanLabel(plan)}
@@ -291,9 +289,7 @@ class PaidAccountHomePage extends React.Component {

Billing Info

-
-
{this.getCardLabel({defaultCardLast4})}
-
+
{this.getCardLabel({defaultCardLast4})}
@@ -301,9 +297,7 @@ class PaidAccountHomePage extends React.Component {

Newsletter

-
-
You are subscribed to email newsletters
-
+
You are subscribed to email newsletters
{ diff --git a/ghost/portal/src/components/pages/AccountProfilePage.js b/ghost/portal/src/components/pages/AccountProfilePage.js index 0a39782fd9..73914dfbb6 100644 --- a/ghost/portal/src/components/pages/AccountProfilePage.js +++ b/ghost/portal/src/components/pages/AccountProfilePage.js @@ -152,7 +152,7 @@ export default class AccountProfilePage extends React.Component { renderProfileData() { return ( -
+
{this.renderInputField('name')} {this.renderInputField('email')}
@@ -170,18 +170,10 @@ export default class AccountProfilePage extends React.Component { } const label = subscribed ? 'You are subscribed to email newsletters' : 'You are not subscribed to email newsletters'; return ( -
-
-
Newsletter
-
{label}
+
+
+

Newsletter

+
{label}
{ @@ -198,10 +190,12 @@ export default class AccountProfilePage extends React.Component { return null; } return ( -
+
{this.renderHeader()} - {this.renderProfileData()} - {this.renderNewsletterOption()} +
+ {this.renderProfileData()} + {this.renderNewsletterOption()} +
{this.renderAccountFooter()}
);