[libadwaita/wip/exalm/oapcity: 8/14] stylesheet: Consistently use dim label oapcity

[Alexander Mikhaylenko <alexm src gnome org>]

commit deabc18b61e63eb2eef5f4e0e595d8df9e503404
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Thu Oct 21 23:14:22 2021 +0500

    stylesheet: Consistently use dim label oapcity
    
    Introduce dimmer opacity variable to replace the 0.3 instances, so that
    they can be adjusted for HC.

 src/stylesheet/_colors.scss          | 2 ++
 src/stylesheet/widgets/_entries.scss | 4 ++--
 src/stylesheet/widgets/_menus.scss   | 8 +++-----
 src/stylesheet/widgets/_misc.scss    | 4 +---
 src/stylesheet/widgets/_scale.scss   | 4 ++--
 5 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/src/stylesheet/_colors.scss b/src/stylesheet/_colors.scss
index 93220faf..8062360c 100644
--- a/src/stylesheet/_colors.scss
+++ b/src/stylesheet/_colors.scss
@@ -79,6 +79,7 @@ $drop_target_color: $accent_bg_color;
 //special cased widget colors
 $focus_border_color:  gtkalpha($accent_bg_color, 0.5);
 $dim_label_opacity: 0.55;
+$dimmer_opacity: 0.3;
 $disabled_opacity: 0.5;
 
 // High Contrast color overrides
@@ -87,6 +88,7 @@ $disabled_opacity: 0.5;
   $focus_border_color: gtkalpha($accent_bg_color, 0.8);
 
   $dim_label_opacity: 0.9;
+  $dimmer_opacity: 0.8;
   $disabled_opacity: 0.4;
 
   $trough_color: gtkalpha(currentColor, .3);
diff --git a/src/stylesheet/widgets/_entries.scss b/src/stylesheet/widgets/_entries.scss
index a55c29c4..848af494 100644
--- a/src/stylesheet/widgets/_entries.scss
+++ b/src/stylesheet/widgets/_entries.scss
@@ -55,7 +55,7 @@ entry {
     }
 
     > image { // icons inside the entry
-      opacity: 0.6;
+      opacity: $dim_label_opacity;
 
       &:hover { opacity: 1; }
 
@@ -66,7 +66,7 @@ entry {
     }
 
     &.password image.caps-lock-indicator {
-      opacity: 0.3;
+      opacity: $dimmer_opacity;
     }
 
     &:drop(active) {
diff --git a/src/stylesheet/widgets/_menus.scss b/src/stylesheet/widgets/_menus.scss
index f8543af1..73eba09e 100644
--- a/src/stylesheet/widgets/_menus.scss
+++ b/src/stylesheet/widgets/_menus.scss
@@ -59,7 +59,7 @@ popover.menu {
   }
 
   accelerator {
-    color: gtkalpha(currentColor, 0.55);
+    color: gtkalpha(currentColor, $dim_label_opacity);
 
     &:dir(ltr) { margin-left: $menu_padding; }
     &:dir(rtl) { margin-right: $menu_padding; }
@@ -86,7 +86,7 @@ popover.menu {
   //only menu radios have a border
   radio {
     padding: 1px;
-    border: 1px solid gtkalpha(currentColor, if($contrast == "high", 1, 0.3));
+    border: 1px solid gtkalpha(currentColor, $dimmer_opacity);
 
     &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/bullet-small-symbolic.symbolic.png")),
                                               -gtk-recolor(url("assets/bullet-small 2-symbolic symbolic 
png"))); }
@@ -127,9 +127,7 @@ popover.menu {
       background: none;
       min-width: 16px;
       min-height: 16px;
-      @if $contrast != "high" {
-        opacity: 0.3; // dim icon
-      }
+      opacity: $dimmer_opacity;
 
       &:hover { background: none; }
 
diff --git a/src/stylesheet/widgets/_misc.scss b/src/stylesheet/widgets/_misc.scss
index 80c1f0d2..315ff059 100644
--- a/src/stylesheet/widgets/_misc.scss
+++ b/src/stylesheet/widgets/_misc.scss
@@ -85,9 +85,7 @@ statuspage {
       > .icon {
         -gtk-icon-size: 128px;
 
-        @if $contrast == 'normal' {
-          color: gtkalpha(currentColor, 0.5);
-        }
+        color: gtkalpha(currentColor, $dim_label_opacity);
 
         &:disabled {
           opacity: $disabled_opacity;
diff --git a/src/stylesheet/widgets/_scale.scss b/src/stylesheet/widgets/_scale.scss
index 698afd32..04c52ede 100644
--- a/src/stylesheet/widgets/_scale.scss
+++ b/src/stylesheet/widgets/_scale.scss
@@ -119,7 +119,7 @@ scale {
 
   &.horizontal {
     > marks {
-      color: gtkalpha(currentColor, 0.55);
+      color: gtkalpha(currentColor, $dim_label_opacity);
       &.top    { margin-bottom: $_marks_distance; }
       &.bottom { margin-top: $_marks_distance; }
 
@@ -155,7 +155,7 @@ scale {
 
   &.vertical {
     > marks {
-      color: gtkalpha(currentColor, 0.55);
+      color: gtkalpha(currentColor, $dim_label_opacity);
       &.top    { margin-right: $_marks_distance; }
       &.bottom { margin-left: $_marks_distance; }