diff options
| author | Kevyn Bruyere <6eme.hokage@gmail.com> | 2016-06-15 14:30:32 +0200 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-06-15 06:30:32 -0600 |
| commit | d6fdd936797890565dff4e6951a6792b7e09831c (patch) | |
| tree | ca188cd891cb4930bae303f1d5f92250c75deba3 /webapp/sass/layout | |
| parent | dbcf8572e5af1c0c244850627437d97616098740 (diff) | |
| download | chat-d6fdd936797890565dff4e6951a6792b7e09831c.tar.gz chat-d6fdd936797890565dff4e6951a6792b7e09831c.tar.bz2 chat-d6fdd936797890565dff4e6951a6792b7e09831c.zip | |
PLT-946 Add status icon to the left of the username in DM channel (#3258)
Add a StatusIcon component to be able to display a status icon from anywhere
Diffstat (limited to 'webapp/sass/layout')
| -rw-r--r-- | webapp/sass/layout/_headers.scss | 2 | ||||
| -rw-r--r-- | webapp/sass/layout/_sidebar-left.scss | 34 |
2 files changed, 4 insertions, 32 deletions
diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss index d0ccfbe23..2382a39e4 100644 --- a/webapp/sass/layout/_headers.scss +++ b/webapp/sass/layout/_headers.scss @@ -144,6 +144,8 @@ white-space: normal; } } + + @import "../components/status-icon"; } .channel-intro { diff --git a/webapp/sass/layout/_sidebar-left.scss b/webapp/sass/layout/_sidebar-left.scss index 6b8658d25..d4d01c865 100644 --- a/webapp/sass/layout/_sidebar-left.scss +++ b/webapp/sass/layout/_sidebar-left.scss @@ -60,38 +60,6 @@ top: 5px; } - .status { - display: inline-block; - margin-right: 6px; - position: relative; - top: 1px; - width: 12px; - - svg { - max-height: 14px; - } - - i, - path, - ellipse { - @include opacity(.5); - - &.online--icon, - &.away--icon { - @include opacity(1); - } - } - - .fa-lock { - margin-left: 1px; - } - - .fa-globe { - position: relative; - top: -1px; - } - } - .nav-pills__container { -webkit-overflow-scrolling: touch; height: calc(100% - 80px); @@ -234,6 +202,8 @@ color: #666666; } } + + @import "../components/status-icon"; } .channel-loading-gif { |