Deprecate monkey scrollbar styles; add styles for new scrollbar (fixes …

…#59)
laCour · Jun 16, 2016 · 0c97e9e · 0c97e9e
1 parent 8798aab
commit 0c97e9e
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 53 deletions.
diff --git a/scss/layout/_base.scss b/scss/layout/_base.scss
@@ -60,3 +60,26 @@ h1 a {
 .right_border {
   border-right: 1px solid $color-shade-dark;
 }
+
+::-webkit-scrollbar-track {
+  background: $color-shade-mid !important;
+}
+
+::-webkit-scrollbar-thumb {
+  background: $color-shade-light !important;
+}
+
+::-webkit-scrollbar-corner {
+  background: $color-base !important;
+}
+
+::-webkit-scrollbar-thumb,
+::-webkit-scrollbar-track {
+  color: $color-base !important;
+}
+
+.feature_indigenous_scroll {
+  #messages_container::after {
+    background: none !important;
+  }
+}
diff --git a/scss/layout/_monkey-scroll.scss b/scss/layout/_monkey-scroll.scss
diff --git a/scss/main.scss b/scss/main.scss
@@ -5,7 +5,6 @@
 
   @import "layout/base";
   @import "layout/sidebar";
-  @import "layout/monkey-scroll";
 
   @import "modules/loader";
 

diff --git a/scss/modules/_hacks.scss b/scss/modules/_hacks.scss
@@ -1,11 +1,3 @@
-#msgs_scroller_div {
-  margin-left: 1px; // This is necessary because this container is being undersized on the width property by a script. Without this, there would be a 1px space on the right, to the left of the monkey scroller.
-}
-
-.monkey_scroll_bar {
-  z-index: 99; // This should have a higher z-index than messages and dividers or else they overlap.
-}
-
 .client_header_icon {
   -moz-filter: brightness(0.6) contrast(3) invert(1) sepia(0.5);
   -webkit-filter: brightness(0.6) contrast(3) invert(1) sepia(0.5);

diff --git a/scss/modules/emojis/_base.scss b/scss/modules/emojis/_base.scss
@@ -75,10 +75,6 @@
     }
   }
 
-  #monkey_scroll_wrapper_for_emoji_menu_items_scroller {
-    background: $color-base;
-  }
-
   #emoji_input:focus {
     border-color: $color-shade-light;
   }

diff --git a/scss/modules/flexpane/_base.scss b/scss/modules/flexpane/_base.scss
@@ -1,10 +1,6 @@
 #flex_contents {
   background: $color-base;
 
-  .monkey_scroll_hider {
-    background: $color-base;
-  }
-
   .heading {
     background: $color-base;
     color: $base-link-color;

diff --git a/scss/pages/_spaces.scss b/scss/pages/_spaces.scss
@@ -356,10 +356,6 @@ comments {
     background-color: $color-shade-dark;
     box-shadow: 0 0 0 1px $color-shadow-dark, 0 0 2px $color-shadow-dark;
   }
-
-  .monkey_scroll_wrapper {
-    background: $color-shade-dark;
-  }
 }
 
 #connection_status {

diff --git a/scss/pages/_website.scss b/scss/pages/_website.scss
@@ -877,7 +877,6 @@ ul.sidebar_nav li {
 }
 
 .plan_availability,
-.menu #monkey_scroll_wrapper_for_menu_items_scroller,
 .modal-backdrop,
 .icon {
   background: $color-shade-dark;