Render incoming avatars

Closes #7
dhleong · Dec 25, 2016 · 5ee8a23 · 5ee8a23
1 parent 7e05392
commit 5ee8a23
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/app/css/main.less b/app/css/main.less
@@ -177,7 +177,9 @@ ul#conversations {
 
             list-style: none;
             overflow: hidden;
-            display: block;
+            display: flex;
+
+            .avatar(32px);
 
             &.hangout {
                 .roboto-condensed();
@@ -221,7 +223,7 @@ ul#conversations {
                 }
                 margin-left: @message-margin;
                 margin-right: (@message-margin / 4);
-                text-align: right;
+                justify-content: flex-end;
             }
 
             .event-item {

diff --git a/src/cljs/hangr/views/conversation.cljs b/src/cljs/hangr/views/conversation.cljs
@@ -166,9 +166,12 @@
                         "pending")]
                      (filter identity)
                      (string/join " "))]
-               ^{:key (:id event)} [:li.event
-                                    {:class class-name}
-                                    [conversation-item event]])))]))))
+               ^{:key (:id event)} 
+               [:li.event
+                {:class class-name}
+                (when (:incoming? event)
+                  [avatar (get member-map (:sender event))])
+                [conversation-item event]])))]))))
 
 ;; -- Main Interface ----------------------------------------------------------