Merge that good fresh upstream shit

2017-07-22 01:16:53 +00:00
parent 0244019ca1 8d6c3cd48a
commit 984d2d4cb6
21 changed files with 253 additions and 23 deletions
--- a/app/javascript/styles/accounts.scss
+++ b/app/javascript/styles/accounts.scss
@@ -31,6 +31,19 @@
    }
  }

+  &.compact {
+    padding: 30px 0;
+    border-radius: 4px;
+
+    .avatar {
+      margin-bottom: 0;
+
+      img {
+        object-fit: cover;
+      }
+    }
+  }
+
  .name {
    display: block;
    position: relative;