diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss index 3f70a7d234..c769c88f75 100644 --- a/app/javascript/styles/mastodon/accounts.scss +++ b/app/javascript/styles/mastodon/accounts.scss @@ -130,21 +130,11 @@ .older { float: left; padding-inline-start: 0; - - .fa { - display: inline-block; - margin-inline-end: 5px; - } } .newer { float: right; padding-inline-end: 0; - - .fa { - display: inline-block; - margin-inline-start: 5px; - } } .disabled { diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 0df8d7a271..fd9515cfef 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -122,10 +122,6 @@ $content-width: 840px; overflow: hidden; text-overflow: ellipsis; - i.fa { - margin-inline-end: 5px; - } - &:hover { color: $primary-text-color; transition: all 100ms linear; @@ -306,10 +302,6 @@ $content-width: 840px; box-shadow: none; } - .directory__tag .table-action-link .fa { - color: inherit; - } - .directory__tag h4 { font-size: 18px; font-weight: 700; diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 3d280ac4af..761dfb5696 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -2891,10 +2891,6 @@ $ui-header-logo-wordmark-width: 99px; padding-inline-end: 30px; } - .search__icon .fa { - top: 15px; - } - .scrollable { overflow: visible; diff --git a/app/javascript/styles/mastodon/dashboard.scss b/app/javascript/styles/mastodon/dashboard.scss index 12d0a6b92f..1621220ccb 100644 --- a/app/javascript/styles/mastodon/dashboard.scss +++ b/app/javascript/styles/mastodon/dashboard.scss @@ -113,10 +113,6 @@ flex: 1 1 auto; } - .fa { - flex: 0 0 auto; - } - strong { font-weight: 700; } diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss index cf8c1327dc..926df4e96f 100644 --- a/app/javascript/styles/mastodon/forms.scss +++ b/app/javascript/styles/mastodon/forms.scss @@ -930,10 +930,6 @@ code { font-weight: 700; } } - - .fa { - font-weight: 400; - } } } } diff --git a/app/javascript/styles/mastodon/rtl.scss b/app/javascript/styles/mastodon/rtl.scss index 07fe96fc3a..e4e299ff82 100644 --- a/app/javascript/styles/mastodon/rtl.scss +++ b/app/javascript/styles/mastodon/rtl.scss @@ -41,14 +41,6 @@ body.rtl { no-repeat left 8px center / auto 16px; } - .fa-chevron-left::before { - content: '\F054'; - } - - .fa-chevron-right::before { - content: '\F053'; - } - .dismissable-banner, .warning-banner { &__action { diff --git a/app/javascript/styles/mastodon/tables.scss b/app/javascript/styles/mastodon/tables.scss index 4997ed9b84..2becd85bc6 100644 --- a/app/javascript/styles/mastodon/tables.scss +++ b/app/javascript/styles/mastodon/tables.scss @@ -142,11 +142,6 @@ a.table-action-link { color: $highlight-text-color; } - i.fa { - font-weight: 400; - margin-inline-end: 5px; - } - &:first-child { padding-inline-start: 0; } diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss index da7d68ce8d..a8f678d482 100644 --- a/app/javascript/styles/mastodon/widgets.scss +++ b/app/javascript/styles/mastodon/widgets.scss @@ -169,11 +169,6 @@ &__message { margin-bottom: 15px; - - .fa { - margin-inline-end: 5px; - color: $darker-text-color; - } } &__card { @@ -366,9 +361,7 @@ padding-inline-end: 16px; } - .fa { - font-size: 16px; - + .icon { &.active { color: $highlight-text-color; } diff --git a/app/views/statuses/_poll.html.haml b/app/views/statuses/_poll.html.haml index cf01b1da01..62416a44da 100644 --- a/app/views/statuses/_poll.html.haml +++ b/app/views/statuses/_poll.html.haml @@ -1,11 +1,10 @@ :ruby show_results = (user_signed_in? && poll.voted?(current_account)) || poll.expired? - own_votes = user_signed_in? ? poll.own_votes(current_account) : [] total_votes_count = poll.voters_count || poll.votes_count .poll %ul - - poll.loaded_options.each_with_index do |option, index| + - poll.loaded_options.each do |option| %li - if show_results - percent = total_votes_count.positive? ? 100 * option.votes_count / total_votes_count : 0 @@ -14,9 +13,6 @@ #{percent.round}% %span.poll__option__text = prerender_custom_emojis(h(option.title), status.emojis) - - if own_votes.include?(index) - %span.poll__voted - %i.poll__voted__mark.fa.fa-check %progress{ max: 100, value: [percent, 1].max, 'aria-hidden': 'true' } %span.poll__chart