From 249049918858b149a4e6f1ad6104b15644614c4b Mon Sep 17 00:00:00 2001
From: Vb Streetz <vbstreetz@gmail.com>
Date: Fri, 20 Mar 2020 04:42:59 +0300
Subject: [PATCH] Some typography color updates

---
 app/assets/v2/css/base.css | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css
index 4e3f0083bc4..e2375910f03 100644
--- a/app/assets/v2/css/base.css
+++ b/app/assets/v2/css/base.css
@@ -1707,12 +1707,8 @@ div.busyOverlay {
 }
 .chat_presence_indicator.mini .indicator {
   font-size: 24px;
-  line-height: 0px;
+  line-height: 0px
 }
-<<<<<<< HEAD
-.navbar .chat_presence_indicator:hover {
-  background-color: rgba(0, 0, 0, 0.5);
-=======
 .indie_chat_indicator{
   color: #0fce7c;
   display: inline;
@@ -1722,18 +1718,16 @@ div.busyOverlay {
 }
 .navbar .chat_presence_indicator:hover{
   background-color: rgba(0,0,0,.5);
->>>>>>> a much more elegant scheme for live call presence
   border-radius: 5px;
 }
-.navbar .chat_presence_indicator {
+.navbar .chat_presence_indicator{
   position: relative;
   left: -16px;
   top: -4px;
 }
-.navbar .chat_presence_indicator .indicator {
+.navbar .chat_presence_indicator .indicator{
   font-size: 22px;
 }
-
 .bg-shade-0 {
   background: var(--bg-shade-0);
 }