From 1566a5d9dd9102d2a41af30a70f9fe5db1d885b4 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Wed, 18 Jun 2014 09:52:29 +0200
Subject: [PATCH] Adwaita: .scrollbars-junction

---
 gtk/resources/theme/Adwaita/_common.scss           | 13 +++++++------
 gtk/resources/theme/Adwaita/gtk-contained-dark.css |  9 +++++----
 gtk/resources/theme/Adwaita/gtk-contained.css      |  9 +++++----
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 4b308a1e37..93f685ec74 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -1024,12 +1024,7 @@ GtkPopover {
   .button {
     border: none;
   }
-  &.trough {
-    background-color: darken($bg_color, 5%);
-    &:backdrop {
-      background-color: transparent;
-    }
-  }
+  &.trough { @extend .scrollbars-junction; }
   &.slider {
     border-radius: 20px;
     border: 3px solid transparent; //margin :/
@@ -1052,6 +1047,12 @@ GtkPopover {
   }
 }
 
+.scrollbars-junction { // the small square between two scrollbars
+  background-color: darken($bg_color, 5%);
+  &:backdrop { background-color: transparent; }
+}
+
+
 /**********
  * Switch *
  **********/
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 51936aa0ff..04b7b41130 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1155,10 +1155,6 @@ GtkPopover {
   -GtkRange-trough-under-steppers: 1; }
   .scrollbar .button {
     border: none; }
-  .scrollbar.trough {
-    background-color: #2d3232; }
-    .scrollbar.trough:backdrop {
-      background-color: transparent; }
   .scrollbar.slider {
     border-radius: 20px;
     border: 3px solid transparent;
@@ -1174,6 +1170,11 @@ GtkPopover {
       .scrollbar.slider.fine-tune:prelight:active {
         background-color: #215d9c; }
 
+.scrollbars-junction, .scrollbar.trough {
+  background-color: #2d3232; }
+  .scrollbars-junction:backdrop, .scrollbar.trough:backdrop {
+    background-color: transparent; }
+
 /**********
  * Switch *
  **********/
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index fe83d3eff7..14356bcd55 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -1155,10 +1155,6 @@ GtkPopover {
   -GtkRange-trough-under-steppers: 1; }
   .scrollbar .button {
     border: none; }
-  .scrollbar.trough {
-    background-color: #e0e0e0; }
-    .scrollbar.trough:backdrop {
-      background-color: transparent; }
   .scrollbar.slider {
     border-radius: 20px;
     border: 3px solid transparent;
@@ -1174,6 +1170,11 @@ GtkPopover {
       .scrollbar.slider.fine-tune:prelight:active {
         background-color: #4a90d9; }
 
+.scrollbars-junction, .scrollbar.trough {
+  background-color: #e0e0e0; }
+  .scrollbars-junction:backdrop, .scrollbar.trough:backdrop {
+    background-color: transparent; }
+
 /**********
  * Switch *
  **********/