[gtk+] Adwaita: use currentColor for scale marks.



commit a9fd764b7706acc24fa07bb474444f37e6f6537c
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Tue Sep 1 18:52:20 2015 +0200

    Adwaita: use currentColor for scale marks.
    
    So it should work ok when used in selected items.

 gtk/theme/Adwaita/_common.scss           |    2 +-
 gtk/theme/Adwaita/gtk-contained-dark.css |    8 ++++----
 gtk/theme/Adwaita/gtk-contained.css      |    8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 1f13b42..2978954 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2336,7 +2336,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
       -GtkRange-slider-width: 24;
       -GtkRange-trough-border: 2;
 
-      color: transparentize($fg_color, 0.7); // marks color
+      color: gtkalpha(currentColor, 0.5); // marks color
 
       @extend %#{$we}_#{$dn};
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 62aacf4..4a01502 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3079,7 +3079,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
-  color: rgba(238, 238, 236, 0.3); }
+  color: alpha(currentColor,0.5); }
   .scale.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3133,7 +3133,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
-  color: rgba(238, 238, 236, 0.3); }
+  color: alpha(currentColor,0.5); }
   .scale.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;
@@ -3187,7 +3187,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
-  color: rgba(238, 238, 236, 0.3); }
+  color: alpha(currentColor,0.5); }
   .scale.vertical.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3241,7 +3241,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
-  color: rgba(238, 238, 236, 0.3); }
+  color: alpha(currentColor,0.5); }
   .scale.vertical.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 99bb8aa..f8e5619 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3241,7 +3241,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
-  color: rgba(46, 52, 54, 0.3); }
+  color: alpha(currentColor,0.5); }
   .scale.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3295,7 +3295,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
-  color: rgba(46, 52, 54, 0.3); }
+  color: alpha(currentColor,0.5); }
   .scale.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;
@@ -3349,7 +3349,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
-  color: rgba(46, 52, 54, 0.3); }
+  color: alpha(currentColor,0.5); }
   .scale.vertical.scale-has-marks-below.slider {
     border-style: none;
     border-radius: 0;
@@ -3403,7 +3403,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
   -GtkScale-slider-length: 20;
   -GtkRange-slider-width: 24;
   -GtkRange-trough-border: 2;
-  color: rgba(46, 52, 54, 0.3); }
+  color: alpha(currentColor,0.5); }
   .scale.vertical.scale-has-marks-above.slider {
     border-style: none;
     border-radius: 0;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]