Browse Source

Fix admin-facing uses of inline CSS (#13575)

* Move .back-button inline styles to CSS file

All occurrences of the back-button CSS class used the same inline
CSS rules, so moved them over to the CSS file

* Fix “Add new domain block” button using inline CSS

* Replace common pattern of inline-styled button boxes by a CSS class

In particular, switching from `float: left/right` to a flexbox with
`justify-content: space-between`. This implied changing the order of
a few HTML tags and adding an empty `div` in one case.

Also removed a `margin-bottom` rule that wasn't needed due to the
margins of surrounding elements.

* Move account admin view inline CSS to CSS file
master^2
ThibG GitHub 11 months ago
parent
commit
b8ba977497
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 53 additions and 31 deletions
  1. +20
    -0
      app/javascript/styles/mastodon/admin.scss
  2. +1
    -1
      app/views/admin/accounts/_account.html.haml
  3. +13
    -13
      app/views/admin/accounts/show.html.haml
  4. +1
    -1
      app/views/admin/instances/index.html.haml
  5. +3
    -3
      app/views/admin/instances/show.html.haml
  6. +4
    -4
      app/views/admin/pending_accounts/index.html.haml
  7. +1
    -1
      app/views/admin/relationships/index.html.haml
  8. +4
    -2
      app/views/admin/reports/show.html.haml
  9. +1
    -1
      app/views/admin/statuses/index.html.haml
  10. +1
    -1
      app/views/admin/statuses/show.html.haml
  11. +4
    -4
      app/views/admin/tags/index.html.haml

+ 20
- 0
app/javascript/styles/mastodon/admin.scss View File

@@ -551,6 +551,18 @@ body,
}
}

.special-action-button,
.back-link {
text-align: right;
flex: 1 1 auto;
}

.action-buttons {
display: flex;
overflow: hidden;
justify-content: space-between;
}

.spacer {
flex: 1 1 auto;
}
@@ -888,3 +900,11 @@ a.name-tag,
}
}
}

.account-badges {
margin: -2px 0;
}

.dashboard__counters.admin-account-counters {
margin-top: 10px;
}

+ 1
- 1
app/views/admin/accounts/_account.html.haml View File

@@ -2,7 +2,7 @@
%td
= admin_account_link_to(account)
%td
%div{ style: 'margin: -2px 0' }= account_badge(account, all: true)
%div.account-badges= account_badge(account, all: true)
%td
- if account.user_current_sign_in_ip
%samp.ellipsized-ip{ title: account.user_current_sign_in_ip }= account.user_current_sign_in_ip


+ 13
- 13
app/views/admin/accounts/show.html.haml View File

@@ -31,7 +31,7 @@
%div
.account__header__content.emojify= Formatter.instance.simplified_format(account, custom_emojify: true)

.dashboard__counters{ style: 'margin-top: 10px' }
.dashboard__counters.admin-account-counters
%div
= link_to admin_account_statuses_path(@account.id) do
.dashboard__counters__num= number_with_delimiter @account.statuses_count
@@ -178,18 +178,8 @@
= @account.shared_inbox_url
= fa_icon DeliveryFailureTracker.available?(@account.shared_inbox_url) ? 'check': 'times'

%div{ style: 'overflow: hidden' }
%div{ style: 'float: right' }
- if @account.local?
= link_to t('admin.accounts.reset_password'), admin_account_reset_path(@account.id), method: :create, class: 'button' if can?(:reset_password, @account.user)
- if @account.user&.otp_required_for_login?
= link_to t('admin.accounts.disable_two_factor_authentication'), admin_user_two_factor_authentication_path(@account.user.id), method: :delete, class: 'button' if can?(:disable_2fa, @account.user)
- if !@account.memorial? && @account.user_approved?
= link_to t('admin.accounts.memorialize'), memorialize_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive' if can?(:memorialize, @account)
- else
= link_to t('admin.accounts.redownload'), redownload_admin_account_path(@account.id), method: :post, class: 'button' if can?(:redownload, @account)

%div{ style: 'float: left' }
%div.action-buttons
%div
- if @account.local? && @account.user_approved?
= link_to t('admin.accounts.warn'), new_admin_account_action_path(@account.id, type: 'none'), class: 'button' if can?(:warn, @account)
- if @account.silenced?
@@ -216,6 +206,16 @@
- else
= link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: @account.domain), class: 'button button--destructive'

%div
- if @account.local?
= link_to t('admin.accounts.reset_password'), admin_account_reset_path(@account.id), method: :create, class: 'button' if can?(:reset_password, @account.user)
- if @account.user&.otp_required_for_login?
= link_to t('admin.accounts.disable_two_factor_authentication'), admin_user_two_factor_authentication_path(@account.user.id), method: :delete, class: 'button' if can?(:disable_2fa, @account.user)
- if !@account.memorial? && @account.user_approved?
= link_to t('admin.accounts.memorialize'), memorialize_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive' if can?(:memorialize, @account)
- else
= link_to t('admin.accounts.redownload'), redownload_admin_account_path(@account.id), method: :post, class: 'button' if can?(:redownload, @account)

%hr.spacer/

- unless @warnings.empty?


+ 1
- 1
app/views/admin/instances/index.html.haml View File

@@ -10,7 +10,7 @@
- unless whitelist_mode?
%li= filter_link_to t('admin.instances.moderation.limited'), limited: '1'

%div{ style: 'flex: 1 1 auto; text-align: right' }
%div.special-action-button
- if whitelist_mode?
= link_to t('admin.domain_allows.add_new'), new_admin_domain_allow_path, class: 'button'
- else


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

@@ -45,11 +45,11 @@

%hr.spacer/

%div{ style: 'overflow: hidden' }
%div{ style: 'float: left' }
%div.action-buttons
%div
= link_to t('admin.accounts.title'), admin_accounts_path(remote: '1', by_domain: @instance.domain), class: 'button'

%div{ style: 'float: right' }
%div
- if @domain_allow
= link_to t('admin.domain_allows.undo'), admin_domain_allow_path(@domain_allow), class: 'button button--destructive', data: { confirm: t('admin.accounts.are_you_sure'), method: :delete }
- elsif @domain_block


+ 4
- 4
app/views/admin/pending_accounts/index.html.haml View File

@@ -25,9 +25,9 @@

%hr.spacer/

%div{ style: 'overflow: hidden' }
%div{ style: 'float: right' }
= link_to t('admin.accounts.reject_all'), reject_all_admin_pending_accounts_path, method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive'

%div.action-buttons
%div
= link_to t('admin.accounts.approve_all'), approve_all_admin_pending_accounts_path, method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button'

%div
= link_to t('admin.accounts.reject_all'), reject_all_admin_pending_accounts_path, method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive'

+ 1
- 1
app/views/admin/relationships/index.html.haml View File

@@ -17,7 +17,7 @@
%li= filter_link_to t('admin.accounts.location.local'), location: 'local'
%li= filter_link_to t('admin.accounts.location.remote'), location: 'remote'

.back-link{ style: 'flex: 1 1 auto; text-align: right' }
.back-link
= link_to admin_account_path(@account.id) do
= fa_icon 'chevron-left fw'
= t('admin.statuses.back_to_account')


+ 4
- 2
app/views/admin/reports/show.html.haml View File

@@ -68,9 +68,11 @@

%hr.spacer

%div{ style: 'overflow: hidden; margin-bottom: 20px; clear: both' }
%div.action-buttons
%div

- if @report.unresolved?
%div{ style: 'float: right' }
%div
- if @report.target_account.local?
= link_to t('admin.accounts.warn'), new_admin_account_action_path(@report.target_account_id, type: 'none', report_id: @report.id), class: 'button'
= link_to t('admin.accounts.disable'), new_admin_account_action_path(@report.target_account_id, type: 'disable', report_id: @report.id), class: 'button button--destructive'


+ 1
- 1
app/views/admin/statuses/index.html.haml View File

@@ -12,7 +12,7 @@
%ul
%li= link_to t('admin.statuses.no_media'), admin_account_statuses_path(@account.id, current_params.merge(media: nil)), class: !params[:media] && 'selected'
%li= link_to t('admin.statuses.with_media'), admin_account_statuses_path(@account.id, current_params.merge(media: true)), class: params[:media] && 'selected'
.back-link{ style: 'flex: 1 1 auto; text-align: right' }
.back-link
= link_to admin_account_path(@account.id) do
= fa_icon 'chevron-left fw'
= t('admin.statuses.back_to_account')


+ 1
- 1
app/views/admin/statuses/show.html.haml View File

@@ -4,7 +4,7 @@
= "@#{@account.acct}"

.filters
.back-link{ style: 'flex: 1 1 auto; text-align: right' }
.back-link
= link_to admin_account_path(@account.id) do
%i.fa.fa-chevron-left.fa-fw
= t('admin.statuses.back_to_account')


+ 4
- 4
app/views/admin/tags/index.html.haml View File

@@ -71,9 +71,9 @@
- if params[:pending_review] == '1' || params[:unreviewed] == '1'
%hr.spacer/

%div{ style: 'overflow: hidden' }
%div{ style: 'float: right' }
= link_to t('admin.accounts.reject_all'), reject_all_admin_tags_path, method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive'

%div.action-buttons
%div
= link_to t('admin.accounts.approve_all'), approve_all_admin_tags_path, method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button'

%div
= link_to t('admin.accounts.reject_all'), reject_all_admin_tags_path, method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive'

Loading…
Cancel
Save