GTK+-3.20 GreenLaguna: fix GtkScale API breakage with stable gtk+

2 files changed, 18 insertions, 22 deletions

diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets-assets.css
index b61ec983..8aeab5b3 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets-assets.css
@@ -21,41 +21,38 @@ scale.vertical slider:disabled {
     background-image: url("assets/scale-slider-vertical-insensitive.svg");
 }
 
-scale.horizontal contents:first-child:not(:only-child) slider,
-scale.horizontal contents:first-child:not(:only-child) slider:hover,
-scale.horizontal.scale-has-marks-below slider,
-scale.horizontal.scale-has-marks-below slider:hover {
+scale.horizontal.marks-after slider,
+scale.horizontal.marks-after slider:hover {
     background-image: url("assets/scale-slider-marks-below-horizontal.svg");
 }
 
-scale.horizontal contents:first-child:not(:only-child) slider:disabled,
-scale.horizontal.scale-has-marks-below slider:disabled {
+scale.horizontal.marks-after slider:disabled {
     background-image: url("assets/scale-slider-marks-below-horizontal-insensitive.svg");
 }
 
-scale.vertical.scale-has-marks-below slider,
-scale.vertical.scale-has-marks-below slider:hover {
+scale.vertical.marks-after slider,
+scale.vertical.marks-after slider:hover {
     background-image: url("assets/scale-slider-marks-below-vertical.svg");
 }
 
-scale.vertical.scale-has-marks-below slider:disabled {
+scale.vertical.marks-after slider:disabled {
     background-image: url("assets/scale-slider-marks-below-vertical-insensitive.svg");
 }
 
-scale.horizontal.scale-has-marks-above slider,
-scale.horizontal.scale-has-marks-above slider:hover {
+scale.horizontal.marks-before slider,
+scale.horizontal.marks-before slider:hover {
     background-image: url("assets/scale-slider-marks-above-horizontal.svg");
 }
 
-scale.horizontal.scale-has-marks-above slider:disabled {
+scale.horizontal.marks-before slider:disabled {
     background-image: url("assets/scale-slider-marks-above-horizontal-insensitive.svg");
 }
 
-scale.vertical.scale-has-marks-above slider {
+scale.vertical.marks-before slider {
     background-image: url("assets/scale-slider-marks-above-vertical.svg");
 }
 
-scale.vertical.scale-has-marks-above slider:disabled {
+scale.vertical.marks-before slider:disabled {
     background-image: url("assets/scale-slider-marks-above-vertical-insensitive.svg");
 }
 
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
index 07d6e0a9..dd95b55c 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
@@ -1646,8 +1646,7 @@ scale.horizontal slider {
     margin: -9px 0px -9px 0px;
 }
 
-/* scale.horizontal.scale-has-marks-below */
-scale.horizontal contents:first-child:not(:only-child) slider {
+scale.horizontal.marks-after slider {
     min-height: 22px;
     min-width: 14px;
 }
@@ -1677,8 +1676,8 @@ scale.vertical.fine-tune slider:hover:active {
     background-position: center;
 }
 
-scale.horizontal.scale-has-marks-above.color,
-scale.vertical.scale-has-marks-below.color {
+scale.horizontal.color.marks-before,
+scale.vertical.color.marks-after {
     margin: 0px 0px 0px 0px;
     padding: 0px;
 }
@@ -1690,7 +1689,7 @@ scale.scale-has-marks-below.color trough {
       background-repeat: no-repeat;
 }
 
-scale.vertical.scale-has-marks-below.color slider {
+scale.vertical.color.marks-after slider {
     min-height: 20px;
     min-width: 20px;
     padding: 0px;
@@ -1700,7 +1699,7 @@ scale.vertical.scale-has-marks-below.color slider {
     margin: 0px 0px 0px 0px;
 }
 
-scale.horizontal.scale-has-marks-above.color slider {
+scale.horizontal.color.marks-before slider {
     min-height: 12px;
     min-width: 16px;
     margin: 0px 0px 0px 0px;
@@ -1710,8 +1709,8 @@ scale.horizontal.scale-has-marks-above.color slider {
     background-position: center;
 }
 
-scale.horizontal.scale-has-marks-above.color slider:hover,
-scale.vertical.scale-has-marks-below.color slider:hover {
+scale.horizontal.color.marks-before slider:hover,
+scale.vertical.color.marks-after slider:hover {
     background-size: 105%;
     background-color: transparent;
 }