From 528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Thu, 15 Jun 2017 11:05:43 -0400
Subject: Merge release-3.10 into master (#6654)

* PLT-6787 Fixed being able to send a post before files finished uploading (#6617)

* Fix quick switcher for channels/users not stored locally (#6610)

* Fix button text on confirm mention modal (#6609)

* fix post delete permission of channel admin (#6608)

* open comment thread for the most recent reply-able message (#6605)

* Use mutex flag with yarn to prevent concurrent builds interfering (#6619)

* Use mutex flag with yarn to prevent concurrent builds interfering

* Remove yarn mutex file with clean

* Minor bug fixes (#6615)

* PLT-6774 - Fixing color for offline icon

* PLT-6784 - Fixing status icon

* Fixing icon margin

* Updating caret position

* PLT-6070 Have ChannelMentionProvider stop searching after a term returns no results (#6620)

* Fixing JS error (#6623)

* Minor bug fixes (#6622)

* PLT-6808 - Updating channel switcher on mobile

* PLT-6743 - Updating scrollbar styling

* Login instead of failing if user exists in OAuth sign-up flow (#6627)

* PLT-6802 Disable team switcher (#6626)

* Disable team switcher

* Fix ESLint errors

* PLT-6807 Ensured select teams page can scroll on iOS (#6630)

* Do not redirect from account switch pages on 401 (#6631)

* Fixing loadtest command and renaming to /test (#6624)

* PLT-6820 Update mattermost-redux dependency (#6632)

* translations PR 20170612 (#6629)

* Bump HTTP client timeout to 30 seconds (#6633)

* For team unreads return empty array instead of null (#6636)

* PLT-6831 Fix status modal localization IDs (#6637)

* Fix status modal localization IDs

* Update test snapshot
---
 webapp/sass/layout/_sidebar-left.scss | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

(limited to 'webapp/sass/layout')

diff --git a/webapp/sass/layout/_sidebar-left.scss b/webapp/sass/layout/_sidebar-left.scss
index 9323253c7..ed587305a 100644
--- a/webapp/sass/layout/_sidebar-left.scss
+++ b/webapp/sass/layout/_sidebar-left.scss
@@ -47,6 +47,7 @@
         border-top: 1px solid;
         bottom: 0;
         display: block;
+        padding-bottom: 0;
         position: absolute;
         width: 100%;
 
@@ -243,7 +244,39 @@
         }
     }
 
-    @import "../components/status-icon";
+    .status-wrapper {
+        .status {
+            bottom: -9px;
+            height: 18px;
+            right: -5px;
+            width: 18px;
+
+            svg {
+                top: 3px;
+                max-height: 12px;
+            }
+
+            .icon__container {
+                position: relative;
+                top: 3px;
+
+                &:after {
+                    border-radius: 20px;
+                    content: '';
+                    height: 9px;
+                    left: 5px;
+                    position: absolute;
+                    top: 2px;
+                    width: 9px;
+                }
+
+                svg {
+                    top: 0;
+                    z-index: 1;
+                }
+            }
+        }
+    }
 }
 
 .channel-loading-gif {
-- 
cgit v1.2.3-1-g7c22