From 021fedeb2a19c73df654f3a9afd7b1cadcbeb75e Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Tue, 16 Apr 2019 14:45:58 -0500 Subject: [PATCH] Replace `fa-retweet` SVG with `fa-repeat` Unicode glyph. --- .../glitch/components/status_action_bar.js | 2 +- .../glitch/components/status_prepend.js | 2 +- .../flavours/glitch/features/reblogs/index.js | 2 +- .../features/status/components/action_bar.js | 2 +- .../glitch/styles/components/boost.scss | 21 ------------------- .../glitch/styles/components/index.scss | 5 ----- app/views/admin/reports/_status.html.haml | 2 +- .../stream_entries/_detailed_status.html.haml | 2 +- .../stream_entries/_simple_status.html.haml | 2 +- app/views/stream_entries/_status.html.haml | 2 +- 10 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 app/javascript/flavours/glitch/styles/components/boost.scss diff --git a/app/javascript/flavours/glitch/components/status_action_bar.js b/app/javascript/flavours/glitch/components/status_action_bar.js index dbc39d587..f753bb6be 100644 --- a/app/javascript/flavours/glitch/components/status_action_bar.js +++ b/app/javascript/flavours/glitch/components/status_action_bar.js @@ -197,7 +197,7 @@ export default class StatusActionBar extends ImmutablePureComponent { const reblogMessage = status.get('visibility') === 'private' ? messages.reblog_private : messages.reblog; let menu = []; - let reblogIcon = 'retweet'; + let reblogIcon = 'repeat'; let replyIcon; let replyTitle; diff --git a/app/javascript/flavours/glitch/components/status_prepend.js b/app/javascript/flavours/glitch/components/status_prepend.js index 481e6644e..3b83dd943 100644 --- a/app/javascript/flavours/glitch/components/status_prepend.js +++ b/app/javascript/flavours/glitch/components/status_prepend.js @@ -82,7 +82,7 @@ export default class StatusPrepend extends React.PureComponent {
diff --git a/app/javascript/flavours/glitch/features/reblogs/index.js b/app/javascript/flavours/glitch/features/reblogs/index.js index e007506b7..1488c09e7 100644 --- a/app/javascript/flavours/glitch/features/reblogs/index.js +++ b/app/javascript/flavours/glitch/features/reblogs/index.js @@ -67,7 +67,7 @@ export default class Reblogs extends ImmutablePureComponent { return ( ); - let reblogIcon = 'retweet'; + let reblogIcon = 'repeat'; //if (status.get('visibility') === 'direct') reblogIcon = 'envelope'; // else if (status.get('visibility') === 'private') reblogIcon = 'lock'; diff --git a/app/javascript/flavours/glitch/styles/components/boost.scss b/app/javascript/flavours/glitch/styles/components/boost.scss deleted file mode 100644 index f1ad041e9..000000000 --- a/app/javascript/flavours/glitch/styles/components/boost.scss +++ /dev/null @@ -1,21 +0,0 @@ -button.icon-button i.fa-retweet { - background-image: url("data:image/svg+xml;utf8,"); - - &:hover { - background-image: url("data:image/svg+xml;utf8,"); - } -} - -// Disabled variant -button.icon-button.disabled i.fa-retweet { - &, &:hover { - background-image: url("data:image/svg+xml;utf8,"); - } -} - -// Disabled variant for use with DMs -.status-direct button.icon-button.disabled i.fa-retweet { - &, &:hover { - background-image: url("data:image/svg+xml;utf8,"); - } -} diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss index 63211392e..553161add 100644 --- a/app/javascript/flavours/glitch/styles/components/index.scss +++ b/app/javascript/flavours/glitch/styles/components/index.scss @@ -869,10 +869,6 @@ transition-duration: 0s; vertical-align: middle; width: 22px; - - &::before { - display: none !important; - } } .no-reduce-motion button.icon-button.active i.fa-retweet { @@ -1304,7 +1300,6 @@ noscript { 100% { opacity: 1; } } -@import 'boost'; @import 'accounts'; @import 'domains'; @import 'status'; diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml index b3c145120..cdb914a03 100644 --- a/app/views/admin/reports/_status.html.haml +++ b/app/views/admin/reports/_status.html.haml @@ -23,7 +23,7 @@ %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) · - 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)) - else = fa_visibility_icon(status) diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index 468f03033..042e5d950 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -66,7 +66,7 @@ - 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 - = fa_icon('retweet') + = fa_icon('repeat') = " " - if user_signed_in? && !@account.user&.setting_hide_stats diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index 4df1a0cdf..d4b919b1a 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -51,7 +51,7 @@ .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 - if status.public_visibility? || status.unlisted_visibility? - = fa_icon 'retweet fw' + = fa_icon 'repeat fw' - elsif status.private_visibility? = fa_icon 'lock fw' - else diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml index 83887cd87..3098b4f8d 100644 --- a/app/views/stream_entries/_status.html.haml +++ b/app/views/stream_entries/_status.html.haml @@ -26,7 +26,7 @@ - if status.reblog? .status__prepend .status__prepend-icon-wrapper - %i.status__prepend-icon.fa.fa-fw.fa-retweet + %i.status__prepend-icon.fa.fa-fw.fa-repeat %span = link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do %bdi