Merge remote-tracking branch 'origin/master' into gs-master

2017-11-16 22:52:37 -06:00
parent ee560abdbe dc6e031364
commit b28b405b97
29 changed files with 136 additions and 72 deletions
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -30,8 +30,12 @@

    - if account.user_admin?
      .roles
-        .account-role
+        .account-role.admin
          = t 'accounts.roles.admin'
+    - elsif account.user_moderator?
+      .roles
+        .account-role.moderator
+          = t 'accounts.roles.moderator'
    .bio
      .account__header__content.p-note.emojify!=processed_bio[:text]
      - if processed_bio[:metadata].length > 0