[gnome-themes-standard/wip/sass] scrollbar: mix color better

[Jakub Steiner <jimmac src gnome org>]

commit 8cf7b1eb31ecf208496150feefd25dfa12009280
Author: Jakub Steiner <jimmac gmail com>
Date:   Wed May 28 15:07:00 2014 +0200

    scrollbar: mix color better
    
    - less contrast
    - works better on dark

 themes/Adwaita/gtk-3.0/_common.scss           |    6 +++---
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |    6 +++---
 themes/Adwaita/gtk-3.0/gtk-contained.css      |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index e67ca37..ac11f39 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -702,12 +702,12 @@ GtkPopover {
   &.slider {
     border-radius: 20px;
     border: 3px solid transparent; //margin :/
-    background-color: darken($bg_color, 30%);
+    background-color: mix($bg_color, $fg_color, 70%);
     &:backdrop, &:insensitive {
-      background-color: darken($bg_color, 20%);
+      background-color: mix($bg_color, $fg_color, 90%);
     }
     &:hover {
-      background-color: darken($bg_color, 40%);
+      background-color: mix($bg_color, $fg_color, 50%);
     }
     &:prelight:active {
       background-color: $selected_bg_color;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 25836e5..b0e42d1 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -801,11 +801,11 @@ GtkPopover {
   .scrollbar.slider {
     border-radius: 20px;
     border: 3px solid transparent;
-    background-color: black; }
+    background-color: #6f7372; }
     .scrollbar.slider:backdrop, .scrollbar.slider:insensitive {
-      background-color: #090909; }
+      background-color: #4b5050; }
     .scrollbar.slider:hover {
-      background-color: black; }
+      background-color: #939695; }
     .scrollbar.slider:prelight:active {
       background-color: #2a76c6; }
     .scrollbar.slider.fine-tune {
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 62ee62a..6bc8c1c 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -801,11 +801,11 @@ GtkPopover {
   .scrollbar.slider {
     border-radius: 20px;
     border: 3px solid transparent;
-    background-color: #a1a1a1; }
+    background-color: #b3b5b6; }
     .scrollbar.slider:backdrop, .scrollbar.slider:insensitive {
-      background-color: #bababa; }
+      background-color: #d9dada; }
     .scrollbar.slider:hover {
-      background-color: #878787; }
+      background-color: #8d9091; }
     .scrollbar.slider:prelight:active {
       background-color: #4a90d9; }
     .scrollbar.slider.fine-tune {