logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe git clone https://hacktivis.me/git/mastofe.git
commit: fa04945365bc552748b9d312f936a74cfd8d35b1
parent 1e87ed44d551e1ff9ea9e0d7219386ecf15173cb
Author: Marcin Mikołajczak <me@m4sk.in>
Date:   Sun, 15 Apr 2018 13:58:47 +0200

Change icon for domain blocks (#7139)

* Change icon for domain blocks

Both domain blocks and user blocks uses the same icon…

* Update index.js

Diffstat:

Mapp/javascript/mastodon/features/domain_blocks/index.js2+-
Mapp/javascript/mastodon/features/getting_started/index.js2+-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/domain_blocks/index.js b/app/javascript/mastodon/features/domain_blocks/index.js @@ -52,7 +52,7 @@ export default class Blocks extends ImmutablePureComponent { } return ( - <Column icon='ban' heading={intl.formatMessage(messages.heading)}> + <Column icon='minus-circle' heading={intl.formatMessage(messages.heading)}> <ColumnBackButtonSlim /> <ScrollableList scrollKey='domain_blocks' onLoadMore={this.handleLoadMore}> {domains.map(domain => diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js @@ -122,7 +122,7 @@ export default class GettingStarted extends ImmutablePureComponent { <ColumnLink icon='thumb-tack' text={intl.formatMessage(messages.pins)} to='/pinned' /> <ColumnLink icon='volume-off' text={intl.formatMessage(messages.mutes)} to='/mutes' /> <ColumnLink icon='ban' text={intl.formatMessage(messages.blocks)} to='/blocks' /> - <ColumnLink icon='ban' text={intl.formatMessage(messages.domain_blocks)} to='/domain_blocks' /> + <ColumnLink icon='minus-circle' text={intl.formatMessage(messages.domain_blocks)} to='/domain_blocks' /> <ColumnLink icon='cog' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' /> <ColumnLink icon='sign-out' text={intl.formatMessage(messages.sign_out)} href='/auth/sign_out' method='delete' /> </div>