GTK+-3.20 Green-Submarine scrollbar.css: sync with Blue-Submarine

1 files changed, 16 insertions, 47 deletions

diff --git a/desktop-themes/Green-Submarine/gtk-3.0/scrollbar.css b/desktop-themes/Green-Submarine/gtk-3.0/scrollbar.css
index ea2a721f..cde68eb2 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/scrollbar.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/scrollbar.css
@@ -16,12 +16,11 @@ scrollbar {
     -GtkScrollbar-activate-slider: 1;
     -GtkScrollbar-min-slider-length: 31;
     -GtkScrolledWindow-scrollbar-spacing: 0;
-    -GtkScrolledWindow-scrollbars-within-bevel: 1;
 }
 
  /* the small square between scrollbars!!!
      no borders with background-image */
-scrollbars-junction {
+scrolledwindow junction {
     background-image: linear-gradient(to bottom,
                                       shade(@theme_bg_color, 1.05),
                                       shade(@theme_bg_color, 1.05));
@@ -67,7 +66,6 @@ scrollbar.vertical slider {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@theme_bg_color, 0.95)),
                                      to (shade (@theme_bg_color, 0.8)));
-	border-style:solid;
     border-color: shade (@theme_bg_color, 0.65);
     border-radius: 10px;
     border-width: 1px;
@@ -86,7 +84,6 @@ scrollbar.horizontal slider {
     background-image: -gtk-gradient (linear, left top, right top,
                                      from (shade (@theme_bg_color, 0.95)),
                                      to (shade (@theme_bg_color, 0.8)));
-	border-style:solid;
     border-color: shade (@theme_bg_color, 0.65);
     border-radius: 10px;
     border-width: 1px;
@@ -125,27 +122,27 @@ scrollbar button:hover,
 scrollbar button:hover:active {
     background-color: alpha(shade(@scrollbar_trough, 0.8), 0.5);
 }
-/* -gtk-image-effect is an invalid property name in GTK 3.20
-scrollbar.button.top:hover {
+
+scrollbar button.top:hover {
     box-shadow: none;
-    -gtk-image-effect: highlight;
+/*    -gtk-image-effect: highlight; invalid property name in GTK 3.20 */
 }
 
-scrollbar.button.bottom:hover {
+scrollbar button.bottom:hover {
     box-shadow: none;
-    -gtk-image-effect: highlight;
+/*    -gtk-image-effect: highlight; invalid property name in GTK 3.20 */
 }
 
-scrollbar.button.right:hover {
+scrollbar button.right:hover {
     box-shadow: none;
-    -gtk-image-effect: highlight;
+/*    -gtk-image-effect: highlight; invalid property name in GTK 3.20 */
 }
 
-scrollbar.button.left:hover {
+scrollbar button.left:hover {
     box-shadow: none;
-    -gtk-image-effect: highlight;
+/*    -gtk-image-effect: highlight; invalid property name in GTK 3.20 */
 }
-*/
+
 scrollbar button {
     color: @theme_fg_color;
 }
@@ -158,35 +155,7 @@ scrollbar button:disabled {
     color: @insensitive_fg_color;
 }
 
-scrollbar slider.fine-tune:hover:active {
-    background-image: url("assets/slider_fine_horizontal.svg"),
-                      linear-gradient(to top,
-                                      shade(@scrollbar_slider, 0.9),
-                                      shade(@scrollbar_slider, 0.81) 55%,
-                                      shade(@scrollbar_slider, 0.6));
-    background-repeat: no-repeat;
-    background-position: center;
-    border-style: solid;
-    border-image: none;
-    border-color: shade(@scrollbar_slider, 0.65);
-    border-width: 1px;
-}
-
-scrollbar slider.vertical.fine-tune:hover:active {
-    background-image: url("assets/slider_fine_vertical.svg"),
-                      linear-gradient(to left,
-                                      shade(@scrollbar_slider, 0.9),
-                                      shade(@scrollbar_slider, 0.81) 55%,
-                                      shade(@scrollbar_slider, 0.6));
-    background-repeat: no-repeat;
-    background-position: center;
-    border-style: solid;
-    border-image: none;
-    border-color: shade(@scrollbar_slider, 0.65);
-    border-width: 1px;
-}
-
-scrollbar slider.fine-tune:hover:active {
+scrollbar.fine-tune slider:hover:active {
     background-image: url("assets/slider_fine_horizontal.svg"),
                       linear-gradient(to top,
                                       shade(@scrollbar_slider, 0.9),
@@ -200,7 +169,7 @@ scrollbar slider.fine-tune:hover:active {
     border-width: 1px;
 }
 
-scrollbar slider.vertical.fine-tune:hover:active {
+scrollbar.vertical.fine-tune slider:hover:active {
     background-image: url("assets/slider_fine_vertical.svg"),
                       linear-gradient(to left,
                                       shade(@scrollbar_slider, 0.9),
@@ -220,17 +189,17 @@ OsThumb {
 }
 
 OsThumb:selected,
-OsScrollbar:selected {
+scrollbar.overlay-indicator:selected {
     background-color: @theme_selected_bg_color;
 }
 
 OsThumb:active,
-OsScrollbar:active {
+scrollbar.overlay-indicator:active {
     background-color: shade (@theme_bg_color, 0.6);
 }
 
 OsThumb:disabled,
-OsScrollbar:disabled {
+scrollbar.overlay-indicator:disabled {
     background-color: shade (@theme_bg_color, 0.85);
 }