Merge pull request #383 from hendricksond/master

Compact seamail user lists
jocosocial · Mar 5, 2020 · 5ad6f48 · 5ad6f48
2 parents e9eb2e4 + 44db649
commit 5ad6f48
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/app/assets/javascripts/templates/seamail/detail.hbs b/app/assets/javascripts/templates/seamail/detail.hbs
@@ -9,11 +9,8 @@
   <div class="card-section">
     {{#each user in model.users}}
       {{#link-to 'user.profile' user.username}}
-        <span class="pull-left" style="padding: 0.5em;">
-          {{pretty-username user.username user.display_name user.pronouns}}
-          <div style="text-align: center;">
-            {{user-picture user.username user.last_photo_updated}}
-          </div>
+        <span class="pull-left seamail" style="padding: 0.5em;">
+          {{user-picture user.username user.last_photo_updated}} {{pretty-username user.username user.display_name user.pronouns}}
         </span>
       {{/link-to}}
     {{/each}}

diff --git a/app/assets/javascripts/templates/seamail/meta_partial.hbs b/app/assets/javascripts/templates/seamail/meta_partial.hbs
@@ -6,12 +6,9 @@
 
   <div class="form">
     {{#each user in model.users}}
-      <span class="pull-left" style="padding: 0.5em;">
-          {{pretty-username user.username user.display_name}}
-        <div style="text-align: center;">
-          {{user-picture user.username user.last_photo_updated}}
-        </div>
-        </span>
+      <span class="pull-left seamail" style="padding: 0.5em;">
+        {{user-picture user.username user.last_photo_updated}} {{pretty-username user.username user.display_name}}
+      </span>
     {{/each}}
   </div>
   <div class="controls">

diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss
@@ -703,6 +703,13 @@ img.layered {
   width: 50px;
 }
 
+.seamail {
+  .profile_photo {
+    height: 25px;
+    width: 25px;
+  }
+}
+
 .footer-controls {
   margin-bottom: 0.6em;
   .card-section {