Skip to content

Commit 90378fc

Browse files
author
masanbol
committed
Revert "Replace unlock-alt icon with unlock (mastodon#9952)"
This reverts commit 6513f6c.
1 parent 328488e commit 90378fc

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

app/helpers/stream_entries_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def fa_visibility_icon(status)
170170
when 'public'
171171
fa_icon 'globe fw'
172172
when 'unlisted'
173-
fa_icon 'unlock fw'
173+
fa_icon 'unlock-alt fw'
174174
when 'private'
175175
fa_icon 'lock fw'
176176
when 'direct'

app/javascript/mastodon/components/account.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class Account extends ImmutablePureComponent {
8888
if (requested) {
8989
buttons = <IconButton disabled icon='hourglass' title={intl.formatMessage(messages.requested)} />;
9090
} else if (blocking) {
91-
buttons = <IconButton active icon='unlock' title={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.handleBlock} />;
91+
buttons = <IconButton active icon='unlock-alt' title={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.handleBlock} />;
9292
} else if (muting) {
9393
let hidingNotificationsButton;
9494
if (account.getIn(['relationship', 'muting_notifications'])) {

app/javascript/mastodon/components/domain.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Account extends ImmutablePureComponent {
3232
</span>
3333

3434
<div className='domain__buttons'>
35-
<IconButton active icon='unlock' title={intl.formatMessage(messages.unblockDomain, { domain })} onClick={this.handleDomainUnblock} />
35+
<IconButton active icon='unlock-alt' title={intl.formatMessage(messages.unblockDomain, { domain })} onClick={this.handleDomainUnblock} />
3636
</div>
3737
</div>
3838
</div>

app/javascript/mastodon/features/account/components/header.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class Header extends ImmutablePureComponent {
132132
} else if (account.getIn(['relationship', 'blocking'])) {
133133
actionBtn = (
134134
<div className='account--action-button'>
135-
<IconButton size={26} icon='unlock' title={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.props.onBlock} />
135+
<IconButton size={26} icon='unlock-alt' title={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.props.onBlock} />
136136
</div>
137137
);
138138
}

app/javascript/mastodon/features/compose/components/privacy_dropdown.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ class PrivacyDropdown extends React.PureComponent {
214214

215215
this.options = [
216216
{ icon: 'globe', value: 'public', text: formatMessage(messages.public_short), meta: formatMessage(messages.public_long) },
217-
{ icon: 'unlock', value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long) },
217+
{ icon: 'unlock-alt', value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long) },
218218
{ icon: 'lock', value: 'private', text: formatMessage(messages.private_short), meta: formatMessage(messages.private_long) },
219219
{ icon: 'envelope', value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
220220
];

0 commit comments

Comments
 (0)