Browse Source

Fix end-user-facing uses of inline CSS (#13438)

* Move some inline styles to CSS files

* Move default_account_display_name span to fix useless tags with duplicate id

* Change handling of public pages spoiler text from inline CSS to dataset attribute

* Use the `dir` HTML attribute instead of inline CSS

* Move status action bar inline CSS to CSS file

* Hide logo resources from CSS file, not inline CSS

Fixes #11601

* Move translation prompt styling from inline CSS to CSS file

* Move “invited by” styling on registration form from inline to CSS file

* Use the progress tag to display poll results in JS fallback

* Fix poll results JS-less fallback when the user has voted for an option

* Change account public page “moved” notice to use img tags instead of inline CSS

* Move OTP hint inline CSS to SCSS file

* Hide JS-less fallback vote progressbars from accessibility tools

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
master^2
ThibG GitHub 11 months ago
parent
commit
0e362b7678
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 125 additions and 36 deletions
  1. +7
    -9
      app/javascript/packs/public.js
  2. +5
    -0
      app/javascript/styles/mastodon/about.scss
  3. +4
    -0
      app/javascript/styles/mastodon/basics.scss
  4. +12
    -0
      app/javascript/styles/mastodon/components.scss
  5. +21
    -0
      app/javascript/styles/mastodon/forms.scss
  6. +30
    -0
      app/javascript/styles/mastodon/polls.scss
  7. +17
    -0
      app/javascript/styles/mastodon/statuses.scss
  8. +3
    -3
      app/views/about/show.html.haml
  9. +4
    -2
      app/views/accounts/_moved.html.haml
  10. +0
    -1
      app/views/application/_card.html.haml
  11. +2
    -2
      app/views/auth/registrations/new.html.haml
  12. +1
    -1
      app/views/auth/sessions/two_factor.html.haml
  13. +0
    -1
      app/views/directories/index.html.haml
  14. +1
    -1
      app/views/layouts/application.html.haml
  15. +1
    -1
      app/views/layouts/embedded.html.haml
  16. +2
    -2
      app/views/settings/preferences/appearance/show.html.haml
  17. +1
    -1
      app/views/settings/profiles/show.html.haml
  18. +3
    -3
      app/views/statuses/_detailed_status.html.haml
  19. +5
    -3
      app/views/statuses/_poll.html.haml
  20. +6
    -6
      app/views/statuses/_simple_status.html.haml

+ 7
- 9
app/javascript/packs/public.js View File

@@ -120,15 +120,13 @@ function main() {
delegate(document, '.custom-emoji', 'mouseout', getEmojiAnimationHandler('data-static'));

delegate(document, '.status__content__spoiler-link', 'click', function() {
const contentEl = this.parentNode.parentNode.querySelector('.e-content');
const statusEl = this.parentNode.parentNode;

if (contentEl.style.display === 'block') {
contentEl.style.display = 'none';
this.parentNode.style.marginBottom = 0;
if (statusEl.dataset.spoiler === 'expanded') {
statusEl.dataset.spoiler = 'folded';
this.textContent = (new IntlMessageFormat(messages['status.show_more'] || 'Show more', locale)).format();
} else {
contentEl.style.display = 'block';
this.parentNode.style.marginBottom = null;
statusEl.dataset.spoiler = 'expanded';
this.textContent = (new IntlMessageFormat(messages['status.show_less'] || 'Show less', locale)).format();
}

@@ -136,8 +134,8 @@ function main() {
});

[].forEach.call(document.querySelectorAll('.status__content__spoiler-link'), (spoilerLink) => {
const contentEl = spoilerLink.parentNode.parentNode.querySelector('.e-content');
const message = (contentEl.style.display === 'block') ? (messages['status.show_less'] || 'Show less') : (messages['status.show_more'] || 'Show more');
const statusEl = spoilerLink.parentNode.parentNode;
const message = (statusEl.dataset.spoiler === 'expanded') ? (messages['status.show_less'] || 'Show less') : (messages['status.show_more'] || 'Show more');
spoilerLink.textContent = (new IntlMessageFormat(message, locale)).format();
});
});
@@ -170,7 +168,7 @@ function main() {
if (target.value) {
name.innerHTML = emojify(escapeTextContentForBrowser(target.value));
} else {
name.textContent = document.querySelector('#default_account_display_name').textContent;
name.textContent = target.dataset.default;
}
}
});


+ 5
- 0
app/javascript/styles/mastodon/about.scss View File

@@ -757,8 +757,13 @@ $small-breakpoint: 960px;
}
}

&__counters__wrapper {
display: flex;
}

&__counter {
padding: 10px;
width: 50%;

strong {
font-family: $font-display, sans-serif;


+ 4
- 0
app/javascript/styles/mastodon/basics.scss View File

@@ -230,6 +230,10 @@ button {
}
}

.logo-resources {
display: none;
}

// NoScript adds a __ns__pop2top class to the full ancestry of blocked elements,
// to set the z-index to a high value, which messes with modals and dropdowns.
// Blocked elements can in theory only be media and frames/embeds, so they


+ 12
- 0
app/javascript/styles/mastodon/components.scss View File

@@ -1362,6 +1362,12 @@ a .account__avatar {
&-base {
@include avatar-radius;
@include avatar-size(36px);

img {
@include avatar-radius;
width: 100%;
height: 100%;
}
}

&-overlay {
@@ -1372,6 +1378,12 @@ a .account__avatar {
bottom: 0;
right: 0;
z-index: 1;

img {
@include avatar-radius;
width: 100%;
height: 100%;
}
}
}



+ 21
- 0
app/javascript/styles/mastodon/forms.scss View File

@@ -142,6 +142,10 @@ code {
}
}

.otp-hint {
margin-bottom: 25px;
}

.card {
margin-bottom: 15px;
}
@@ -285,6 +289,14 @@ code {
margin-bottom: 25px;
}
}

.fields-group.invited-by {
margin-bottom: 30px;

.hint {
text-align: center;
}
}
}

.input.radio_buttons .radio label {
@@ -635,6 +647,15 @@ code {
@media screen and (max-width: 740px) and (min-width: 441px) {
margin-top: 40px;
}

&.translation-prompt {
text-align: unset;
color: unset;

a {
text-decoration: underline;
}
}
}

.form-footer {


+ 30
- 0
app/javascript/styles/mastodon/polls.scss View File

@@ -19,6 +19,36 @@
}
}

progress {
border: 0;
display: block;
width: 100%;
height: 5px;
appearance: none;
background: transparent;

&::-webkit-progress-bar {
background: transparent;
}

// Those rules need to be entirely separate or they won't work, hence the
// duplication
&::-moz-progress-bar {
border-radius: 4px;
background: darken($ui-primary-color, 5%);
}

&::-ms-fill {
border-radius: 4px;
background: darken($ui-primary-color, 5%);
}

&::-webkit-progress-value {
border-radius: 4px;
background: darken($ui-primary-color, 5%);
}
}

&__option {
position: relative;
display: flex;


+ 17
- 0
app/javascript/styles/mastodon/statuses.scss View File

@@ -128,6 +128,16 @@

.embed,
.public-layout {
.status__content[data-spoiler=folded] {
.e-content {
display: none;
}

p:first-child {
margin-bottom: 0;
}
}

.detailed-status {
padding: 15px;
}
@@ -159,5 +169,12 @@
.video-player {
margin-top: 10px;
}

&__action-bar-button {
font-size: 18px;
width: 23.1429px;
height: 23.1429px;
line-height: 23.15px;
}
}
}

+ 3
- 3
app/views/about/show.html.haml View File

@@ -68,11 +68,11 @@
.hero-widget__footer__column
%h4= t 'about.server_stats'

%div{ style: 'display: flex' }
.hero-widget__counter{ style: 'width: 50%' }
.hero-widget__counters__wrapper
.hero-widget__counter
%strong= number_to_human @instance_presenter.user_count, strip_insignificant_zeros: true
%span= t 'about.user_count_after', count: @instance_presenter.user_count
.hero-widget__counter{ style: 'width: 50%' }
.hero-widget__counter
%strong= number_to_human @instance_presenter.active_user_count, strip_insignificant_zeros: true
%span
= t 'about.active_count_after'


+ 4
- 2
app/views/accounts/_moved.html.haml View File

@@ -9,8 +9,10 @@
= link_to ActivityPub::TagManager.instance.url_for(moved_to_account), class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'me noopener noreferrer' do
.detailed-status__display-avatar
.account__avatar-overlay
.account__avatar-overlay-base{ style: "background-image: url('#{moved_to_account.avatar.url(:original)}')" }
.account__avatar-overlay-overlay{ style: "background-image: url('#{account.avatar.url(:original)}')" }
.account__avatar-overlay-base
= image_tag moved_to_account.avatar_static_url
.account__avatar-overlay-overlay
= image_tag account.avatar_static_url

%span.display-name
%bdi


+ 0
- 1
app/views/application/_card.html.haml View File

@@ -9,7 +9,6 @@
= image_tag account.avatar.url, alt: '', width: 48, height: 48, class: 'u-photo'

.display-name
%span{ id: "default_account_display_name", style: "display: none" }= account.username
%bdi
%strong.emojify.p-name= display_name(account, custom_emojify: true)
%span


+ 2
- 2
app/views/auth/registrations/new.html.haml View File

@@ -8,8 +8,8 @@
= render 'shared/error_messages', object: resource

- if @invite.present? && @invite.autofollow?
.fields-group{ style: 'margin-bottom: 30px' }
%p.hint{ style: 'text-align: center' }= t('invites.invited_by')
.fields-group.invited-by
%p.hint= t('invites.invited_by')
= render 'application/card', account: @invite.user.account

= f.simple_fields_for :account do |ff|


+ 1
- 1
app/views/auth/sessions/two_factor.html.haml View File

@@ -2,7 +2,7 @@
= t('auth.login')

= simple_form_for(resource, as: resource_name, url: session_path(resource_name), method: :post) do |f|
%p.hint{ style: 'margin-bottom: 25px' }= t('simple_form.hints.sessions.otp')
%p.hint.otp-hint= t('simple_form.hints.sessions.otp')

.fields-group
= f.input :otp_attempt, type: :number, wrapper: :with_label, label: t('simple_form.labels.defaults.otp_attempt'), input_html: { 'aria-label' => t('simple_form.labels.defaults.otp_attempt'), :autocomplete => 'off' }, autofocus: true


+ 0
- 1
app/views/directories/index.html.haml View File

@@ -28,7 +28,6 @@
= image_tag account.avatar.url, alt: '', width: 48, height: 48, class: 'u-photo'

.display-name
%span{ id: "default_account_display_name", style: "display: none" }= account.username
%bdi
%strong.emojify.p-name= display_name(account, custom_emojify: true)
%span= acct(account)


+ 1
- 1
app/views/layouts/application.html.haml View File

@@ -34,6 +34,6 @@
%body{ class: body_classes }
= content_for?(:content) ? yield(:content) : yield

%div{ style: 'display: none'}
.logo-resources
= render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')
= render file: Rails.root.join('app', 'javascript', 'images', 'logo_full.svg')

+ 1
- 1
app/views/layouts/embedded.html.haml View File

@@ -19,5 +19,5 @@
%body.embed
= yield

%div{ style: 'display: none'}
.logo-resources
= render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')

+ 2
- 2
app/views/settings/preferences/appearance/show.html.haml View File

@@ -12,8 +12,8 @@
= f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false, hint: false

- unless I18n.locale == :en
.flash-message{ style: "text-align: unset; color: unset" }
#{t 'appearance.localization.body'} #{content_tag(:a, t('appearance.localization.guide_link_text'), href: t('appearance.localization.guide_link'), target: "_blank", rel: "noopener", style: "text-decoration: underline")}
.flash-message.translation-prompt
#{t 'appearance.localization.body'} #{content_tag(:a, t('appearance.localization.guide_link_text'), href: t('appearance.localization.guide_link'), target: "_blank", rel: "noopener")}

%h4= t 'appearance.advanced_web_interface'



+ 1
- 1
app/views/settings/profiles/show.html.haml View File

@@ -9,7 +9,7 @@

.fields-row
.fields-row__column.fields-group.fields-row__column-6
= f.input :display_name, wrapper: :with_label, input_html: { maxlength: 30 }, hint: false
= f.input :display_name, wrapper: :with_label, input_html: { maxlength: 30, data: { default: @account.username } }, hint: false
= f.input :note, wrapper: :with_label, input_html: { maxlength: 500 }, hint: false

.fields-row


+ 3
- 3
app/views/statuses/_detailed_status.html.haml View File

@@ -15,12 +15,12 @@

= account_action_button(status.account)

.status__content.emojify<
.status__content.emojify{ :data => ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }<
- if status.spoiler_text?
%p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
%p<
%span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}&nbsp;
%button.status__content__spoiler-link= t('statuses.show_more')
.e-content{ style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }
.e-content{ dir: rtl_status?(status) ? 'rtl' : 'ltr' }
= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
- if status.preloadable_poll
= react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do


+ 5
- 3
app/views/statuses/_poll.html.haml View File

@@ -10,13 +10,15 @@
- percent = total_votes_count > 0 ? 100 * option.votes_count / total_votes_count : 0
%label.poll__option><
%span.poll__number><
- if own_votes.include?(index)
%i.poll__voted__mark.fa.fa-check
= "#{percent.round}%"
%span.poll__option__text
= Formatter.instance.format_poll_option(status, option, autoplay: autoplay)
- if own_votes.include?(index)
%span.poll__voted
%i.poll__voted__mark.fa.fa-check

%span.poll__chart{ style: "width: #{percent}%" }
%progress{ max: 100, value: percent < 1 ? 1 : percent, 'aria-hidden': 'true' }
%span.poll__chart
- else
%label.poll__option><
%span.poll__input{ class: poll.multiple? ? 'checkbox' : nil}><


+ 6
- 6
app/views/statuses/_simple_status.html.haml View File

@@ -19,12 +19,12 @@
%span.display-name__account
= acct(status.account)
= fa_icon('lock') if status.account.locked?
.status__content.emojify<
.status__content.emojify{ :data => ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }<
- if status.spoiler_text?
%p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
%p<
%span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}&nbsp;
%button.status__content__spoiler-link= t('statuses.show_more')
.e-content{ style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }
.e-content{ dir: rtl_status?(status) ? 'rtl' : 'ltr' }
= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
- if status.preloadable_poll
= react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do
@@ -51,18 +51,18 @@

.status__action-bar
.status__action-bar__counter
= link_to remote_interaction_path(status, type: :reply), 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: :reply), class: 'status__action-bar-button icon-button modal-button' do
- if status.in_reply_to_id.nil?
= fa_icon 'reply fw'
- else
= fa_icon 'reply-all fw'
.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' do
- if status.distributable?
= fa_icon 'retweet fw'
- elsif status.private_visibility? || status.limited_visibility?
= fa_icon 'lock fw'
- else
= fa_icon 'envelope fw'
= link_to remote_interaction_path(status, type: :favourite), 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: :favourite), class: 'status__action-bar-button icon-button modal-button' do
= fa_icon 'star fw'

Loading…
Cancel
Save