Scrollable tables in settings pages (#4857)

* Scrollable tables in settings pages

* Add space before curly brace
master
Lynx Kotoura 7 years ago committed by Eugen Rochko
parent baa8b82179
commit 3c45d3963a
  1. 8
      app/javascript/styles/admin.scss
  2. 17
      app/javascript/styles/tables.scss
  3. 3
      app/views/admin/accounts/_card.html.haml
  4. 3
      app/views/admin/accounts/index.html.haml
  5. 4
      app/views/admin/accounts/show.html.haml
  6. 3
      app/views/admin/domain_blocks/index.html.haml
  7. 3
      app/views/admin/instances/index.html.haml
  8. 1
      app/views/admin/reports/index.html.haml
  9. 3
      app/views/admin/subscriptions/index.html.haml
  10. 3
      app/views/auth/registrations/_sessions.html.haml
  11. 3
      app/views/oauth/authorized_applications/index.html.haml
  12. 3
      app/views/settings/applications/index.html.haml
  13. 3
      app/views/settings/applications/show.html.haml
  14. 3
      app/views/settings/exports/show.html.haml
  15. 1
      app/views/settings/follower_domains/show.html.haml

@ -190,11 +190,15 @@
.filters {
display: flex;
margin-bottom: 20px;
flex-wrap: wrap;
.filter-subset {
flex: 0 0 auto;
margin-right: 40px;
margin: 0 40px 10px 0;
&:last-child {
margin-bottom: 20px;
}
ul {
margin-top: 5px;

@ -3,7 +3,6 @@
max-width: 100%;
border-spacing: 0;
border-collapse: collapse;
margin-bottom: 20px;
th,
td {
@ -43,17 +42,15 @@
font-weight: 500;
}
&.inline-table {
td,
th {
padding: 8px 2px;
}
& > tbody > tr:nth-child(odd) > td,
& > tbody > tr:nth-child(odd) > th {
&.inline-table > tbody > tr:nth-child(odd) > td,
&.inline-table > tbody > tr:nth-child(odd) > th {
background: transparent;
}
}
}
.table-wrapper {
overflow: auto;
margin-bottom: 20px;
}
samp {

@ -1,4 +1,5 @@
%table.table
.table-wrapper
%table.table
%tbody
%tr
%td= t('admin.accounts.show.created_reports')

@ -50,7 +50,8 @@
%button= t('admin.accounts.search')
= link_to t('admin.accounts.reset'), admin_accounts_path, class: 'button negative'
%table.table
.table-wrapper
%table.table
%thead
%tr
%th= t('admin.accounts.username')

@ -1,7 +1,8 @@
- content_for :page_title do
= @account.acct
%table.table
.table-wrapper
%table.table
%tbody
%tr
%th= t('admin.accounts.username')
@ -81,7 +82,6 @@
%th= t('.targeted_reports')
%td= link_to pluralize(@account.targeted_reports.count, t('.report')), admin_reports_path(target_account_id: @account.id)
%div{ style: 'float: right' }
- if @account.local?
= link_to t('admin.accounts.reset_password'), admin_account_reset_path(@account.id), method: :create, class: 'button'

@ -1,7 +1,8 @@
- content_for :page_title do
= t('admin.domain_blocks.title')
%table.table
.table-wrapper
%table.table
%thead
%tr
%th= t('admin.domain_blocks.domain')

@ -1,7 +1,8 @@
- content_for :page_title do
= t('admin.instances.title')
%table.table
.table-wrapper
%table.table
%thead
%tr
%th= t('admin.instances.domain_name')

@ -10,6 +10,7 @@
= form_tag do
.table-wrapper
%table.table
%thead
%tr

@ -1,7 +1,8 @@
- content_for :page_title do
= t('admin.subscriptions.title')
%table.table
.table-wrapper
%table.table
%thead
%tr
%th= t('admin.subscriptions.topic')

@ -1,7 +1,8 @@
%h6= t 'sessions.title'
%p.muted-hint= t 'sessions.explanation'
%table.table.inline-table
.table-wrapper
%table.table.inline-table
%thead
%tr
%th= t 'sessions.browser'

@ -1,7 +1,8 @@
- content_for :page_title do
= t('doorkeeper.authorized_applications.index.title')
%table.table
.table-wrapper
%table.table
%thead
%tr
%th= t('doorkeeper.authorized_applications.index.application')

@ -1,7 +1,8 @@
- content_for :page_title do
= t('doorkeeper.applications.index.title')
%table.table
.table-wrapper
%table.table
%thead
%tr
%th= t('doorkeeper.applications.index.application')

@ -3,7 +3,8 @@
%p.hint= t('applications.warning')
%table.table
.table-wrapper
%table.table
%tbody
%tr
%th= t('doorkeeper.applications.show.application_id')

@ -1,7 +1,8 @@
- content_for :page_title do
= t('settings.export')
%table.table
.table-wrapper
%table.table
%tbody
%tr
%th= t('exports.storage')

@ -12,6 +12,7 @@
%p= t('followers.explanation_html')
%p= t('followers.true_privacy_html')
.table-wrapper
%table.table
%thead
%tr

Loading…
Cancel
Save