diff --git a/ghost/portal/src/components/PopupModal.js b/ghost/portal/src/components/PopupModal.js
index d4678aea43..81591bae8f 100644
--- a/ghost/portal/src/components/PopupModal.js
+++ b/ghost/portal/src/components/PopupModal.js
@@ -16,20 +16,20 @@ const React = require('react');
const StylesWrapper = ({member}) => {
const isPaidMember = (member && member.paid);
const accountHome = isPaidMember ? {
- width: '500px',
+ width: '532px',
minHeight: '650px',
maxHeight: '700px'
} : {
- width: '500px',
+ width: '532px',
minHeight: '330px',
maxHeight: '330px'
};
const accountProfile = isPaidMember ? {
- width: '500px',
+ width: '532px',
minHeight: '320px',
maxHeight: '320px'
} : {
- width: '500px',
+ width: '532px',
minHeight: '380px',
maxHeight: '380px'
};
@@ -44,7 +44,7 @@ const StylesWrapper = ({member}) => {
height: '100%',
overflow: 'auto',
textAlign: 'center',
- backgroundColor: 'rgba(128,128,128,0.5)'
+ backgroundColor: 'rgba(0,0,0,0.65)'
},
frame: {
common: {
@@ -52,9 +52,9 @@ const StylesWrapper = ({member}) => {
position: 'relative',
padding: '0',
outline: '0',
- width: '500px',
+ width: '532px',
borderRadius: '8px',
- boxShadow: 'rgba(0, 0, 0, 0.16) 0px 5px 40px',
+ boxShadow: '0 2.8px 2.2px rgba(0, 0, 0, 0.034), 0 6.7px 5.3px rgba(0, 0, 0, 0.048), 0 12.5px 10px rgba(0, 0, 0, 0.06), 0 22.3px 17.9px rgba(0, 0, 0, 0.072), 0 41.8px 33.4px rgba(0, 0, 0, 0.086), 0 100px 80px rgba(0, 0, 0, 0.12)',
opacity: '1',
overflow: 'hidden',
height: '60%',
@@ -77,7 +77,7 @@ const StylesWrapper = ({member}) => {
minHeight: '130px'
},
accountPlan: {
- width: '500px',
+ width: '532px',
minHeight: '290px',
maxHeight: '290px'
},
@@ -100,16 +100,18 @@ const StylesWrapper = ({member}) => {
left: '0px',
right: '0px',
overflow: 'hidden',
- paddingTop: '18px',
- paddingBottom: '18px',
+ paddingTop: '32px',
+ paddingBottom: '32px',
textAlign: 'left',
- boxSizing: 'border-box'
+ boxSizing: 'border-box',
+ position: 'relative'
},
closeIcon: {
width: '16px',
height: '16px',
- color: 'grey',
- cursor: 'pointer'
+ color: '#999',
+ cursor: 'pointer',
+ padding: '12px'
}
}
};
@@ -173,7 +175,7 @@ class PopupContent extends React.Component {
renderPopupClose() {
const Styles = StylesWrapper({});
return (
-
+
this.context.onAction('closePopup')} />
);
@@ -216,7 +218,7 @@ export default class PopupModal extends React.Component {
renderPopupClose() {
const Styles = StylesWrapper({});
return (
-
+
this.context.onAction('closePopup')} />
);
diff --git a/ghost/portal/src/components/TriggerButton.js b/ghost/portal/src/components/TriggerButton.js
index 67fbf60cd2..ba9ef046eb 100644
--- a/ghost/portal/src/components/TriggerButton.js
+++ b/ghost/portal/src/components/TriggerButton.js
@@ -8,7 +8,6 @@ const React = require('react');
const Styles = ({brandColor, hasText}) => {
const frame = {
- ...(hasText ? {borderRadius: '12px'} : {}),
...(!hasText ? {width: '60px'} : {})
};
return {
@@ -21,7 +20,7 @@ const Styles = ({brandColor, hasText}) => {
maxWidth: '500px',
height: '60px',
boxShadow: 'rgba(0, 0, 0, 0.06) 0px 1px 6px 0px, rgba(0, 0, 0, 0.16) 0px 2px 32px 0px',
- borderRadius: '50%',
+ borderRadius: '999px',
backgroundColor: brandColor,
animation: '250ms ease 0s 1 normal none running animation-bhegco',
transition: 'opacity 0.3s ease 0s',
@@ -38,7 +37,7 @@ const Styles = ({brandColor, hasText}) => {
transformOrigin: 'center center',
backfaceVisibility: 'hidden',
WebkitFontSmoothing: 'antialiased',
- borderRadius: '50%',
+ borderRadius: '999px',
overflow: 'hidden'
},
button: {
diff --git a/ghost/portal/src/components/common/ActionButton.js b/ghost/portal/src/components/common/ActionButton.js
index fbd51bd59f..efe783b069 100644
--- a/ghost/portal/src/components/common/ActionButton.js
+++ b/ghost/portal/src/components/common/ActionButton.js
@@ -19,7 +19,8 @@ const Styles = ({brandColor, retry, disabled, style = {}}) => {
border: '0',
fontSize: '1.5rem',
lineHeight: '42px',
- fontWeight: '600',
+ fontWeight: '500',
+ letterSpacing: '0.2px',
textAlign: 'center',
textDecoration: 'none',
whiteSpace: 'nowrap',
diff --git a/ghost/portal/src/components/pages/AccountHomePage.js b/ghost/portal/src/components/pages/AccountHomePage.js
index 89d5fb1696..f4bdb0b574 100644
--- a/ghost/portal/src/components/pages/AccountHomePage.js
+++ b/ghost/portal/src/components/pages/AccountHomePage.js
@@ -18,10 +18,9 @@ const UserAvatar = ({avatar}) => {
display: 'flex',
width: '64px',
height: '64px',
- marginBottom: '6px',
- borderRadius: '100%',
+ marginBottom: '8px',
+ borderRadius: '999px',
boxShadow: '0 0 0 3px #fff',
- border: '1px solid gray',
overflow: 'hidden',
justifyContent: 'center',
alignItems: 'center'
@@ -29,21 +28,21 @@ const UserAvatar = ({avatar}) => {
return (
-
+
);
};
const AccountFooter = ({onLogout, onSettings, brandColor}) => {
return (
-
-
Contact support
+
+
Contact support
{onSettings
- ?
Settings
+ ?
Settings
: null
}
-
Logout
+
Logout
);
@@ -52,9 +51,9 @@ const AccountFooter = ({onLogout, onSettings, brandColor}) => {
const UserHeader = ({member}) => {
const avatar = member.avatar_image;
return (
-
+
-
Your Account
+
Your Account
);
};
@@ -98,10 +97,10 @@ class FreeAccountHomePage extends React.Component {
const {title: siteTitle} = this.context.site;
return (
-
-
-
Hey {firstname || name || email}!
- You are subscribed to free updates from
{siteTitle}, but you don't have a paid subscription to unlock full access
+
+
+ Hey {firstname || name || email}!
+ You are subscribed to free updates from {siteTitle}, but you don't have a paid subscription to unlock full access
{this.renderSubscribeButton()}
@@ -111,7 +110,7 @@ class FreeAccountHomePage extends React.Component {
render() {
const {member, brandColor} = this.context;
return (
-
+
{this.renderAccountDetail()}
this.handleSignout(e)} onSettings={e => this.openSettings(e)} brandColor={brandColor} />
@@ -133,10 +132,10 @@ class PaidAccountHomePage extends React.Component {
const siteTitle = this.context.site.title;
return (
-
-
-
Hey {firstname || name || email}!
- You have an active
{siteTitle} account with access to all areas. Get in touch if you have any problems or need some help getting things updated, and thanks for subscribing.
+
+
+ Hey {firstname || name || email}!
+ You have an active {siteTitle} account with access to all areas. Get in touch if you have any problems or need some help getting things updated, and thanks for subscribing.
);