From 8d6ae29d871eca0c76caa00aaf34f2172ed16930 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 18 Dec 2019 10:28:06 +1100
Subject: [PATCH] conversation list item update unread border and count

---
 .../_session_theme_dark_left_pane.scss        | 26 +++++++++++++++++++
 ts/components/ConversationListItem.tsx        |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/stylesheets/_session_theme_dark_left_pane.scss b/stylesheets/_session_theme_dark_left_pane.scss
index 9734b91f4..18a8d68e9 100644
--- a/stylesheets/_session_theme_dark_left_pane.scss
+++ b/stylesheets/_session_theme_dark_left_pane.scss
@@ -86,3 +86,29 @@
     }
   }
 }
+
+.module-conversation-list-item--has-unread {
+  border-left: 4px solid $session-color-green !important;
+}
+
+.module-conversation-list-item__unread-count,
+.dark-theme .module-conversation-list-item__unread-count {
+  color: $color-white;
+  background-color: $session-shade-10;
+  position: static;
+  font-weight: 700;
+}
+
+.module-conversation-list-item__header__date,
+.module-conversation-list-item__header__date--has-unread,
+.dark-theme .module-conversation-list-item__header__date,
+.dark-theme .module-conversation-list-item__header__date--has-unread {
+  flex-grow: 1;
+  text-align: end;
+}
+
+.module-conversation-list-item__header__name,
+.dark-theme .module-conversation-list-item__header__name {
+  flex-grow: 0 !important;
+  padding-right: 5px;
+}
diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx
index d26d1fe08..cade4a0fe 100644
--- a/ts/components/ConversationListItem.tsx
+++ b/ts/components/ConversationListItem.tsx
@@ -90,7 +90,6 @@ export class ConversationListItem extends React.PureComponent<Props> {
           size={48}
           borderColor={borderColor}
         />
-        {this.renderUnread()}
       </div>
     );
   }
@@ -147,6 +146,7 @@ export class ConversationListItem extends React.PureComponent<Props> {
             />
           )}
         </div>
+        {this.renderUnread()}
         {!isFriendItem && (
           <div
             className={classNames(