Replace `fa-retweet` SVG with `fa-repeat` Unicode glyph.

staging
multiple creatures 2019-04-16 14:45:58 -05:00
parent 841776edfb
commit 021fedeb2a
10 changed files with 8 additions and 34 deletions

View File

@ -197,7 +197,7 @@ export default class StatusActionBar extends ImmutablePureComponent {
const reblogMessage = status.get('visibility') === 'private' ? messages.reblog_private : messages.reblog; const reblogMessage = status.get('visibility') === 'private' ? messages.reblog_private : messages.reblog;
let menu = []; let menu = [];
let reblogIcon = 'retweet'; let reblogIcon = 'repeat';
let replyIcon; let replyIcon;
let replyTitle; let replyTitle;

View File

@ -82,7 +82,7 @@ export default class StatusPrepend extends React.PureComponent {
<div className={type === 'reblogged_by' || type === 'featured' ? 'status__prepend-icon-wrapper' : 'notification__favourite-icon-wrapper'}> <div className={type === 'reblogged_by' || type === 'featured' ? 'status__prepend-icon-wrapper' : 'notification__favourite-icon-wrapper'}>
<i <i
className={`fa fa-fw fa-${ className={`fa fa-fw fa-${
type === 'favourite' ? 'star star-icon' : (type === 'featured' ? 'thumb-tack' : (type === 'poll' ? 'tasks' : 'retweet')) type === 'favourite' ? 'star star-icon' : (type === 'featured' ? 'thumb-tack' : (type === 'poll' ? 'tasks' : 'repeat'))
} status__prepend-icon`} } status__prepend-icon`}
/> />
</div> </div>

View File

@ -67,7 +67,7 @@ export default class Reblogs extends ImmutablePureComponent {
return ( return (
<Column ref={this.setRef}> <Column ref={this.setRef}>
<ColumnHeader <ColumnHeader
icon='retweet' icon='repeat'
title={intl.formatMessage(messages.heading)} title={intl.formatMessage(messages.heading)}
onClick={this.handleHeaderClick} onClick={this.handleHeaderClick}
showBackButton showBackButton

View File

@ -192,7 +192,7 @@ export default class ActionBar extends React.PureComponent {
<div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.share)} icon='share-alt' onClick={this.handleShare} /></div> <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.share)} icon='share-alt' onClick={this.handleShare} /></div>
); );
let reblogIcon = 'retweet'; let reblogIcon = 'repeat';
//if (status.get('visibility') === 'direct') reblogIcon = 'envelope'; //if (status.get('visibility') === 'direct') reblogIcon = 'envelope';
// else if (status.get('visibility') === 'private') reblogIcon = 'lock'; // else if (status.get('visibility') === 'private') reblogIcon = 'lock';

File diff suppressed because one or more lines are too long

View File

@ -869,10 +869,6 @@
transition-duration: 0s; transition-duration: 0s;
vertical-align: middle; vertical-align: middle;
width: 22px; width: 22px;
&::before {
display: none !important;
}
} }
.no-reduce-motion button.icon-button.active i.fa-retweet { .no-reduce-motion button.icon-button.active i.fa-retweet {
@ -1304,7 +1300,6 @@ noscript {
100% { opacity: 1; } 100% { opacity: 1; }
} }
@import 'boost';
@import 'accounts'; @import 'accounts';
@import 'domains'; @import 'domains';
@import 'status'; @import 'status';

View File

@ -23,7 +23,7 @@
%time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
· ·
- if status.reblog? - if status.reblog?
= fa_icon('retweet fw') = fa_icon('repeat fw')
= t('statuses.boosted_from_html', acct_link: admin_account_inline_link_to(status.proper.account)) = t('statuses.boosted_from_html', acct_link: admin_account_inline_link_to(status.proper.account))
- else - else
= fa_visibility_icon(status) = fa_visibility_icon(status)

View File

@ -66,7 +66,7 @@
- elsif user_signed_in? && !@account.user&.setting_hide_stats - elsif user_signed_in? && !@account.user&.setting_hide_stats
· ·
= link_to remote_interaction_path(status, type: :reblog), class: 'modal-button detailed-status__link', title: number_to_human(status.reblogs_count, strip_insignificant_zeros: true) do = link_to remote_interaction_path(status, type: :reblog), class: 'modal-button detailed-status__link', title: number_to_human(status.reblogs_count, strip_insignificant_zeros: true) do
= fa_icon('retweet') = fa_icon('repeat')
= " " = " "
- if user_signed_in? && !@account.user&.setting_hide_stats - if user_signed_in? && !@account.user&.setting_hide_stats

View File

@ -51,7 +51,7 @@
.status__action-bar__counter__label= obscured_counter status.replies_count .status__action-bar__counter__label= obscured_counter status.replies_count
= link_to remote_interaction_path(status, type: :reblog), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do = link_to remote_interaction_path(status, type: :reblog), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do
- if status.public_visibility? || status.unlisted_visibility? - if status.public_visibility? || status.unlisted_visibility?
= fa_icon 'retweet fw' = fa_icon 'repeat fw'
- elsif status.private_visibility? - elsif status.private_visibility?
= fa_icon 'lock fw' = fa_icon 'lock fw'
- else - else

View File

@ -26,7 +26,7 @@
- if status.reblog? - if status.reblog?
.status__prepend .status__prepend
.status__prepend-icon-wrapper .status__prepend-icon-wrapper
%i.status__prepend-icon.fa.fa-fw.fa-retweet %i.status__prepend-icon.fa.fa-fw.fa-repeat
%span %span
= link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do = link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do
%bdi %bdi