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

2017-11-27 11:29:04 -06:00
parent 5de42665d7 1c5b0e3334
commit e77c3996a5
29 changed files with 440 additions and 6 deletions
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@ -448,3 +448,19 @@
    color: $success-green;
  }
 }
+
+.name-tag {
+  display: flex;
+  align-items: center;
+
+  .avatar {
+    display: block;
+    margin: 0;
+    margin-right: 5px;
+    border-radius: 50%;
+  }
+
+  .username {
+    font-weight: 500;
+  }
+}