From 7fa8f7febcc552befe4399a8e3f2a6397d347016 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Thu, 20 Aug 2015 12:04:36 -0700
Subject: Fixed issue with channel name in url and added loading icon to
 replace 'Join' button for slow connections

---
 web/sass-files/sass/partials/_sidebar--left.scss | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'web/sass-files/sass/partials/_sidebar--left.scss')

diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 6d9f2ad8b..7bbaa21cb 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -124,7 +124,15 @@
 }
 
 .channel-loading-gif {
-    height:15px;
-    width:15px;
-    margin-top:2px;
+    height: 15px;
+    width: 15px;
+    margin-top: 2px;
+}
+
+.join-channel-loading-gif {
+    margin-top: 5px;
+    margin-left: 10px;
+    height: 25px;
+    width: 25px;
+
 }
-- 
cgit v1.2.3-1-g7c22


From 701cbfa94abce6bb26d6bdada66c644a2d4fba0b Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Thu, 20 Aug 2015 21:48:49 +0500
Subject: Multiple UI Improvements

---
 web/sass-files/sass/partials/_sidebar--left.scss | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'web/sass-files/sass/partials/_sidebar--left.scss')

diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 6d9f2ad8b..22b7426b1 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -38,24 +38,25 @@
         height: 100%;
         position: relative;
         overflow: auto;
-
     }
 
     .nav-pills__unread-indicator {
         position: absolute;
         left: 0;
         right: 0;
-        width: 70%;
-        background-color: darken($primary-color, 5%);
-        color: white;
+        width: 72%;
+        color: #777;
+        background: #DCF0FF;
+        @include border-radius(50px);
         margin: 0 auto;
-        padding: 2px;
+        padding: 3px 0 4px;
+        font-size: 13.5px;
         text-align: center;
         z-index: 1;
     }
 
     .nav-pills__unread-indicator-top {
-        top: 56px;
+        top: 66px;
     }
     .nav-pills__unread-indicator-bottom {
         bottom: 0px;
-- 
cgit v1.2.3-1-g7c22