Update sidebar channel selector styles

laCour · Apr 23, 2017 · 1b0a569 · 1b0a569
1 parent 1f11548
commit 1b0a569
Showing 1 changed file with 27 additions and 31 deletions.
diff --git a/scss/layout/_sidebar.scss b/scss/layout/_sidebar.scss
@@ -38,28 +38,20 @@
         }
       }
 
-      .group_close,
-      .im_close,
-      .mpim_close {
-        color: $base-link-color !important;
+      .primary_action {
+        &.feature_user_custom_status:hover .im_name_background,
+        &:not(.feature_user_custom_status):hover {
+          background: $color-base;
+        }
       }
 
       &.mention a {
         color: $base-font-color;
       }
 
       &.unread {
-        &:not(.muted_channel) {
+        &:not(.muted_channel) .primary_action {
           color: lighten($base-font-color, 6%) !important;
-
-          .channel_name,
-          .group_name,
-          .im_name,
-          .mpim_name,
-          > a {
-            background: $color-shade-dark;
-            color: lighten($base-font-color, 6%) !important;
-          }
         }
 
         .prefix {
@@ -70,16 +62,22 @@
     }
   }
 
-  .unread_just {
-    background: $color-base;
-    color: $base-font-color;
+  .group_close,
+  .im_close,
+  .mpim_close {
+    color: $base-link-color !important;
   }
 
   .unread_highlights {
     background: $color-red;
     color: $base-font-color;
     text-shadow: 0 1px 0 $color-shadow-light;
   }
+
+  .unread_msgs {
+    background: $color-base;
+    color: $base-font-color;
+  }
 }
 
 .channels_list_new_btn {
@@ -97,29 +95,27 @@
 }
 
 #channels_scroller.show_which_channel_is_active ul li.active {
-  .channel_name,
-  .group_name,
-  .mpim_name,
-  .im_name {
+  .primary_action {
     background: $color-base;
-    color: $base-font-color !important;
-  }
+    color: $base-font-color;
 
-  a {
-    &.group_name,
-    &.im_name,
-    &.mpim_name {
+    &.feature_user_custom_status .im_name_background {
       background: $color-base;
-      color: $base-font-color;
     }
 
-    &.channel_name .prefix,
-    &.group_name .prefix {
+    .prefix {
       color: $color-highlight;
     }
   }
 
-  .unread_highlights {
+  .group_close,
+  .im_close,
+  .mpim_close {
+    color: $base-font-color;
+  }
+
+  .unread_highlights,
+  .unread_msgs {
     background: $color-red;
     color: $base-font-color;
   }