Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-04-01 02:41:39 -05:00
Code Issues Activity

Cleaned up style attributes

Browse source
This commit is contained in:
Peter Zimon 2020-07-24 10:46:13 +02:00
parent e1640740f4
commit 5484d5e2d8
5 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ghost/portal/src/App.js
View file

@ -143,7 +143,7 @@ export default class App extends React.Component {
showPopup: true,
site: Fixtures.site,
member: Fixtures.member.free,
page: 'signup'
page: 'accountPlan'
};
}
return {};

32
ghost/portal/src/components/common/MemberGravatar.js
View file

@ -11,29 +11,29 @@ export const AvatarStyles = `
margin-bottom: 8px;
border-radius: 999px;
}
.gh-portal-avatar img {
display: block;
position: absolute;
top: -1px;
right: -1px;
bottom: -1px;
left: -1px;
width: calc(100% + 2px);
height: calc(100% + 2px);
opacity: 1;
maxWidth: unset;
}
`;
const Styles = ({style = {}}) => {
return {
userIcon: {
width: '20px',
height: '20px',
width: '56px',
height: '56px',
color: '#fff',
...(style.userIcon || {}) // Override any custom style
},
gravatar: {
display: 'block',
position: 'absolute',
top: '-1px',
right: '-1px',
bottom: '-1px',
left: '-1px',
width: 'calc(100% + 2px)',
height: 'calc(100% + 2px)',
opacity: '1',
maxWidth: 'unset',
...(style.gravatar || {}) // Override any custom style
}
};
};
@ -42,7 +42,7 @@ function MemberGravatar({gravatar, style}) {
return (
<figure className='gh-portal-avatar'>
<UserIcon style={Style.userIcon} />
{gravatar ? <img style={Style.gravatar} src={gravatar} alt="Gravatar" /> : null}
{gravatar ? <img src={gravatar} alt="Gravatar" /> : null}
</figure>
);
}

1
ghost/portal/src/components/pages/AccountHomePage.js
View file

@ -55,6 +55,7 @@ export const AccountHomePageStyles = `
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 24px;
}
.gh-portal-freeaccount-newsletter .label {

2
ghost/portal/src/components/pages/AccountPlanPage.js
View file

@ -128,7 +128,7 @@ export default class AccountPlanPage extends React.Component {
return null;
}
return (
<div style={{display: 'flex', flexDirection: 'column', color: '#313131'}}>
<div>
{this.renderHeader()}
{this.renderPlanChooser()}
</div>

6
ghost/portal/src/components/pages/AccountProfilePage.js
View file

@ -68,7 +68,7 @@ export default class AccountProfilePage extends React.Component {
renderDeleteAccountButton() {
return (
<div style={{cursor: 'pointer', color: 'red'}} role='button'> Delete Account </div>
<div style={{cursor: 'pointer', color: 'red'}} role='button'>Delete account</div>
);
}
@ -108,7 +108,7 @@ export default class AccountProfilePage extends React.Component {
return (
<div style={avatarContainerStyle}>
<MemberAvatar gravatar={avatarImg} style={{userIcon: {color: 'black', width: '45px', height: '45px'}}} />
<MemberAvatar gravatar={avatarImg} style={{userIcon: {color: 'black', width: '56px', height: '56px'}}} />
</div>
);
}
@ -167,7 +167,7 @@ export default class AccountProfilePage extends React.Component {
}
const label = subscribed ? 'Subscribed to email newsletters' : 'Not subscribed to email newsletters';
return (
<div className='gh-portal-freeaccount-newsletter' style={{marginTop: '24px'}}>
<div className='gh-portal-freeaccount-newsletter'>
<div className='label'>
<h3 className='gh-portal-input-label'>Newsletter</h3>
<div className='gh-portal-setting-data'>{label}</div>