mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Replace unlock-alt icon with unlock 

Port 6513f6c953 to glitch-soc
pull/904/head
Thibaut Girka 2019-02-01 16:15:44 +01:00
parent e87bd6d94a
commit 2e93f87c9f
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/components/account.js
View File

@ -85,7 +85,7 @@ export default class Account extends ImmutablePureComponent {
if (requested) { if (requested) {
buttons = <IconButton disabled icon='hourglass' title={intl.formatMessage(messages.requested)} />; buttons = <IconButton disabled icon='hourglass' title={intl.formatMessage(messages.requested)} />;
} else if (blocking) { } else if (blocking) {
buttons = <IconButton active icon='unlock-alt' title={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.handleBlock} />; buttons = <IconButton active icon='unlock' title={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.handleBlock} />;
} else if (muting) { } else if (muting) {
let hidingNotificationsButton; let hidingNotificationsButton;
if (account.getIn(['relationship', 'muting_notifications'])) { if (account.getIn(['relationship', 'muting_notifications'])) {

2
app/javascript/flavours/glitch/components/domain.js
View File

@ -32,7 +32,7 @@ export default class Account extends ImmutablePureComponent {
</span> </span>
<div className='domain__buttons'> <div className='domain__buttons'>
<IconButton active icon='unlock-alt' title={intl.formatMessage(messages.unblockDomain, { domain })} onClick={this.handleDomainUnblock} /> <IconButton active icon='unlock' title={intl.formatMessage(messages.unblockDomain, { domain })} onClick={this.handleDomainUnblock} />
</div> </div>
</div> </div>
</div> </div>

2
app/javascript/flavours/glitch/components/status_visibility_icon.js
View File

@ -25,7 +25,7 @@ export default class VisibilityIcon extends ImmutablePureComponent {
const visibilityClass = { const visibilityClass = {
public: 'globe', public: 'globe',
unlisted: 'unlock-alt', unlisted: 'unlock',
private: 'lock', private: 'lock',
direct: 'envelope', direct: 'envelope',
}[visibility]; }[visibility];

2
app/javascript/flavours/glitch/features/account/components/header.js
View File

@ -88,7 +88,7 @@ export default class Header extends ImmutablePureComponent {
} else if (account.getIn(['relationship', 'blocking'])) { } else if (account.getIn(['relationship', 'blocking'])) {
actionBtn = ( actionBtn = (
<div className='account--action-button'> <div className='account--action-button'>
<IconButton size={26} icon='unlock-alt' title={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.props.onBlock} /> <IconButton size={26} icon='unlock' title={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.props.onBlock} />
</div> </div>
); );
} }

2
app/javascript/flavours/glitch/features/composer/options/index.js
View File

@ -197,7 +197,7 @@ export default class ComposerOptions extends React.PureComponent {
text: <FormattedMessage {...messages.public_short} />, text: <FormattedMessage {...messages.public_short} />,
}, },
unlisted: { unlisted: {
icon: 'unlock-alt', icon: 'unlock',
meta: <FormattedMessage {...messages.unlisted_long} />, meta: <FormattedMessage {...messages.unlisted_long} />,
name: 'unlisted', name: 'unlisted',
text: <FormattedMessage {...messages.unlisted_short} />, text: <FormattedMessage {...messages.unlisted_short} />,

4
app/javascript/flavours/glitch/features/composer/publisher/index.js
View File

@ -58,7 +58,7 @@ export default function ComposerPublisher ({
<Icon <Icon
icon={{ icon={{
public: 'globe', public: 'globe',
unlisted: 'unlock-alt', unlisted: 'unlock',
private: 'lock', private: 'lock',
direct: 'envelope', direct: 'envelope',
}[sideArm]} }[sideArm]}
@ -82,7 +82,7 @@ export default function ComposerPublisher ({
direct: 'envelope', direct: 'envelope',
private: 'lock', private: 'lock',
public: 'globe', public: 'globe',
unlisted: 'unlock-alt', unlisted: 'unlock',
}[privacy]} }[privacy]}
/> />
{' '} {' '}