Fixes #46 and minor style updates

pichalite · Sep 30, 2016 · bceb6a0 · bceb6a0
1 parent aedc398
commit bceb6a0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/less/chat.less b/less/chat.less
@@ -279,8 +279,6 @@
 
 		textarea {
 			width: ~"calc(100% - 60px)";
-			position: absolute;
-			left: 5px;
 			font-size: 13px;
 			border: 0;
 			padding: 10px 8px;
@@ -399,7 +397,7 @@
 		}
 
 		.lv-footer {
-			padding: 5px 10px;
+			padding: 5px 10px 5px 0;
 			background-color: @chat-footer-bg-color;
 		}
 
@@ -443,6 +441,12 @@
 	    		display: block;
 	    	}
 	    }
+
+	    &[data-self="1"]+[data-self="1"][data-break="false"] {
+            .user-avatar, .user-icon {
+                display: none;
+            }
+        }
 	}
 
 	.users-tag-container {
@@ -656,6 +660,12 @@
 	    		display: block;
 	    	}
 	    }
+
+	    &[data-self="1"]+[data-self="1"][data-break="false"] {
+            .user-avatar, .user-icon {
+                display: none;
+            }
+        }
 	}
 
 	.modal-header {

diff --git a/templates/partials/chat_message.tpl b/templates/partials/chat_message.tpl
@@ -1,12 +1,10 @@
 <li component="chat/message" class="lv-item media<!-- IF messages.self --> right<!-- ENDIF messages.self -->" data-index="{messages.index}" data-mid="{messages.messageId}" data-uid="{messages.fromuid}" data-self="{messages.self}" data-break="{messages.newSet}">
     <div class="lv-avatar <!-- IF messages.self -->pull-right<!-- ELSE -->pull-left<!-- ENDIF messages.self -->">
-        <!-- IF messages.newSet -->
         <!-- IF messages.fromUser.picture -->
         <img class="user-avatar" src="{messages.fromUser.picture}">
         <!-- ELSE -->
         <div class="user-icon" style="background-color: {messages.fromUser.icon:bgColor};">{messages.fromUser.icon:text}</div>
         <!-- ENDIF messages.fromUser.picture -->
-        <!-- ENDIF messages.newSet -->
     </div>
     <!-- IF messages.newSet -->
     <div><small class="ms-date"><i class="fa fa-clock-o"></i> <span class="timeago" title="{messages.timestampISO}"></span></small></div>