ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #284 - Alignment in notifications column

rebase/4.0.0rc2
Eugen Rochko 2016-12-02 14:52:41 +01:00
parent d9232959df
commit 470f629b06
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/components/components/account.jsx
View File

@ -31,7 +31,8 @@ const noteStyle = {
}; };
const buttonsStyle = { const buttonsStyle = {
padding: '10px' padding: '10px',
height: '18px'
}; };
const Account = React.createClass({ const Account = React.createClass({
@ -68,26 +69,24 @@ const Account = React.createClass({
note = <div style={noteStyle}>{account.get('note')}</div>; note = <div style={noteStyle}>{account.get('note')}</div>;
} }
if (account.get('id') !== me) { if (account.get('id') !== me && account.get('relationship', null) != null) {
const following = account.getIn(['relationship', 'following']); const following = account.getIn(['relationship', 'following']);
buttons = ( buttons = <IconButton icon={following ? 'user-times' : 'user-plus'} title={intl.formatMessage(messages.follow)} onClick={this.handleFollow} active={following} />;
<div style={buttonsStyle}>
<IconButton icon={following ? 'user-times' : 'user-plus'} title={intl.formatMessage(messages.follow)} onClick={this.handleFollow} active={following} />
</div>
);
} }
return ( return (
<div style={outerStyle}> <div style={outerStyle}>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<Link key={account.get('id')} style={itemStyle} className='account__display-name' to={`/accounts/${account.get('id')}`}> <Link key={account.get('id')} style={itemStyle} className='account__display-name' to={`/accounts/${account.get('id')}`}>
<div style={{ float: 'left', marginRight: '10px' }}><Avatar src={account.get('avatar')} size={36} /></div> <div style={{ float: 'left', marginLeft: '12px', marginRight: '10px' }}><Avatar src={account.get('avatar')} size={36} /></div>
<DisplayName account={account} /> <DisplayName account={account} />
</Link> </Link>
<div style={buttonsStyle}>
{buttons} {buttons}
</div> </div>
</div>
{note} {note}
</div> </div>

33
app/assets/javascripts/components/features/notifications/components/notification.jsx
View File

@ -6,11 +6,13 @@ import { FormattedMessage } from 'react-intl';
import { Link } from 'react-router'; import { Link } from 'react-router';
const messageStyle = { const messageStyle = {
padding: '8px 10px', marginLeft: '68px',
padding: '8px 0',
paddingBottom: '0', paddingBottom: '0',
cursor: 'default', cursor: 'default',
color: '#d9e1e8', color: '#d9e1e8',
fontSize: '15px' fontSize: '15px',
position: 'relative'
}; };
const linkStyle = { const linkStyle = {
@ -28,7 +30,14 @@ const Notification = React.createClass({
renderFollow (account, link) { renderFollow (account, link) {
return ( return (
<div className='notification'> <div className='notification'>
<div style={messageStyle}><i className='fa fa-fw fa-user-plus' style={{ color: '#2b90d9' }} /> <FormattedMessage id='notification.follow' defaultMessage='{name} followed you' values={{ name: link }} /></div> <div style={messageStyle}>
<div style={{ position: 'absolute', 'left': '-26px'}}>
<i className='fa fa-fw fa-user-plus' style={{ color: '#2b90d9' }} />
</div>
<FormattedMessage id='notification.follow' defaultMessage='{name} followed you' values={{ name: link }} />
</div>
<AccountContainer id={account.get('id')} withNote={false} /> <AccountContainer id={account.get('id')} withNote={false} />
</div> </div>
); );
@ -41,7 +50,14 @@ const Notification = React.createClass({
renderFavourite (notification, link) { renderFavourite (notification, link) {
return ( return (
<div className='notification'> <div className='notification'>
<div style={messageStyle}><i className='fa fa-fw fa-star' style={{ color: '#ca8f04' }} /> <FormattedMessage id='notification.favourite' defaultMessage='{name} favourited your status' values={{ name: link }} /></div> <div style={messageStyle}>
<div style={{ position: 'absolute', 'left': '-26px'}}>
<i className='fa fa-fw fa-star' style={{ color: '#ca8f04' }} />
</div>
<FormattedMessage id='notification.favourite' defaultMessage='{name} favourited your status' values={{ name: link }} />
</div>
<StatusContainer id={notification.get('status')} muted={true} /> <StatusContainer id={notification.get('status')} muted={true} />
</div> </div>
); );
@ -50,7 +66,14 @@ const Notification = React.createClass({
renderReblog (notification, link) { renderReblog (notification, link) {
return ( return (
<div className='notification'> <div className='notification'>
<div style={messageStyle}><i className='fa fa-fw fa-retweet' style={{ color: '#2b90d9' }} /> <FormattedMessage id='notification.reblog' defaultMessage='{name} reblogged your status' values={{ name: link }} /></div> <div style={messageStyle}>
<div style={{ position: 'absolute', 'left': '-26px'}}>
<i className='fa fa-fw fa-retweet' style={{ color: '#2b90d9' }} />
</div>
<FormattedMessage id='notification.reblog' defaultMessage='{name} reblogged your status' values={{ name: link }} />
</div>
<StatusContainer id={notification.get('status')} muted={true} /> <StatusContainer id={notification.get('status')} muted={true} />
</div> </div>
); );