diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-14 17:14:05 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-14 17:17:20 +0100 |
commit | 07eb31eeacc4e0364b839233a41fa65eb3c650ce (patch) | |
tree | 843cda5a4d9bc730aba9a13d0634fef5e2212515 /app/views/invites/index.html.haml | |
parent | fa75324059c7a146354470691888dc0e1de0342f (diff) | |
parent | 874bd3ac0c56e2d2901785e170b27f5cde32b33b (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
Diffstat (limited to 'app/views/invites/index.html.haml')
-rw-r--r-- | app/views/invites/index.html.haml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/app/views/invites/index.html.haml b/app/views/invites/index.html.haml index fb827f6e6..61420ab1e 100644 --- a/app/views/invites/index.html.haml +++ b/app/views/invites/index.html.haml @@ -8,12 +8,13 @@ %hr.spacer/ -%table.table - %thead - %tr - %th= t('invites.table.uses') - %th= t('invites.table.expires_at') - %th - %th - %tbody - = render @invites +.simple_form + %table.table.table--invites + %thead + %tr + %th + %th= t('invites.table.uses') + %th= t('invites.table.expires_at') + %th + %tbody + = render @invites |