about summary refs log tree commit diff
path: root/app/views/admin/subscriptions
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-09-09 23:56:21 -0500
committerDavid Yip <yipdw@member.fsf.org>2017-09-09 23:56:21 -0500
commit67ad4533732f2e5cfc8c7f7ad3abaf7a5eb2647b (patch)
tree011ea44fc94bcff6f8ec4e23c3edf887359243d2 /app/views/admin/subscriptions
parent3dff74eecf5387b92b862893248710d2efb90eec (diff)
parent90712d42933efd9978e4bbae82f81a4650aa4d84 (diff)
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss
Diffstat (limited to 'app/views/admin/subscriptions')
-rw-r--r--app/views/admin/subscriptions/index.html.haml21
1 files changed, 11 insertions, 10 deletions
diff --git a/app/views/admin/subscriptions/index.html.haml b/app/views/admin/subscriptions/index.html.haml
index 21b3238a6..83704c8ee 100644
--- a/app/views/admin/subscriptions/index.html.haml
+++ b/app/views/admin/subscriptions/index.html.haml
@@ -1,15 +1,16 @@
 - content_for :page_title do
   = t('admin.subscriptions.title')
 
-%table.table
-  %thead
-    %tr
-      %th= t('admin.subscriptions.topic')
-      %th= t('admin.subscriptions.callback_url')
-      %th= t('admin.subscriptions.confirmed')
-      %th= t('admin.subscriptions.expires_in')
-      %th= t('admin.subscriptions.last_delivery')
-  %tbody
-    = render @subscriptions
+.table-wrapper
+  %table.table
+    %thead
+      %tr
+        %th= t('admin.subscriptions.topic')
+        %th= t('admin.subscriptions.callback_url')
+        %th= t('admin.subscriptions.confirmed')
+        %th= t('admin.subscriptions.expires_in')
+        %th= t('admin.subscriptions.last_delivery')
+    %tbody
+      = render @subscriptions
 
 = paginate @subscriptions