Even more Elevation fixing

tau-OS · Jul 30, 2024 · 4725a8b · 4725a8b
1 parent 1e7ea51
commit 4725a8b
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 30 deletions.
diff --git a/Helium/gtk-4.0/_functions.scss b/Helium/gtk-4.0/_functions.scss
@@ -29,15 +29,12 @@
       @return image($view_bg_color);
   // Elevation 1
   } @else if $level == 1 {
-      @return image($surface_bg_color);
+      @return image($surface_container_bg_color);
   // Elevation 2
   } @else if $level == 2 {
-      @return image($surface_container_bg_color);
+      @return image($surface_container_high_bg_color);
   // Elevation 3
   } @else if $level == 3 {
-      @return image($surface_container_high_bg_color);
-  // Elevation 4
-  } @else if $level == 4 {
       @return image($surface_container_highest_bg_color);
   } @else {
       @return image($view_bg_color);

diff --git a/Helium/gtk-4.0/_tauos.scss b/Helium/gtk-4.0/_tauos.scss
@@ -645,7 +645,7 @@ $colors: (
   }
 
   &:active {
-    background: bg-color(4);
+    background: bg-color(3);
     color: $accent_color;
     box-shadow: shadow(2);
   }
@@ -870,7 +870,7 @@ $colors: (
   }
 
   row:selected:hover & {
-    background: bg-color(4);
+    background: bg-color(3);
     color: $accent_color;
   }
 }
@@ -914,7 +914,7 @@ $colors: (
   }
 
   row:selected:hover & {
-    background: bg-color(4);
+    background: bg-color(3);
     color: $accent_color;
   }
 }
@@ -930,22 +930,22 @@ $colors: (
   }
   &:checked {
     box-shadow: none;
-    background: bg-color(3);
+    background: bg-color(2);
     color: $view_fg_color;
   }
   &:hover {
-    background: bg-color(2);
+    background: bg-color(1);
     box-shadow: shadow(1), inset 0 0 0 1px gtkalpha($borders, .38);
     color: $view_fg_color;
   }
   &:hover:checked {
-    background: bg-color(3);
+    background: bg-color(2);
     box-shadow: shadow(1), inset 0 0 0 1px gtkalpha($borders, .38);
     color: $view_fg_color;
   }
   &:active {
     box-shadow: none;
-    background: bg-color(4);
+    background: bg-color(3);
     color: $view_fg_color;
   }
 }
@@ -1338,13 +1338,13 @@ $colors: (
   }
 
   & .appbar {
-    background: bg-color(3);
+    background: bg-color(2);
 
     .disclosure-button {
-      background: bg-color(4);
+      background:bg-color(3);
 
       &.toggle {
-        background: bg-color(4);
+        background: bg-color(3);
         border-radius: px-to-rem(9999px);
 
         &:hover {
@@ -1375,7 +1375,7 @@ $colors: (
       }
 
       & button {
-        background: bg-color(4);
+        background: bg-color(3);
         border-radius: px-to-rem(9999px);
 
         &:hover {
@@ -1425,16 +1425,16 @@ $colors: (
   box-shadow: none;
 
   & button:hover {
-    background: bg-color(2);
+    background: bg-color(1);
     color: $view_fg_color;
     box-shadow: inset 0 0 0 1px gtkalpha($borders, .38);
   }
   & button:checked {
-    background: bg-color(3);
+    background: bg-color(2);
     color: $view_fg_color;
   }
   & button:hover:checked {
-    background: bg-color(4);
+    background: bg-color(3);
     color: $view_fg_color;
   }
 }

diff --git a/Helium/gtk-4.0/widgets/_checks.scss b/Helium/gtk-4.0/widgets/_checks.scss
@@ -43,9 +43,9 @@ radio {
 
     &:active {
       @if $contrast == 'high' {
-        background: bg-color(4); color: $accent_color;
+        background: bg-color(3); color: $accent_color;
       } @else {
-        background: bg-color(4); color: $accent_color;
+        background: bg-color(3); color: $accent_color;
       }
       box-shadow: none;
     }
@@ -67,9 +67,9 @@ radio {
 
     &:active {
       @if $contrast == 'high' {
-        background: bg-color(4); color: $accent_color;
+        background: bg-color(3); color: $accent_color;
       } @else {
-        background: bg-color(4); color: $accent_color;
+        background: bg-color(3); color: $accent_color;
       }
       box-shadow: none;
     }

diff --git a/Helium/gtk-4.0/widgets/_lists.scss b/Helium/gtk-4.0/widgets/_lists.scss
@@ -45,7 +45,7 @@ row {
     &:selected {
       &:hover { background: bg-color(2); color: $accent_color; }
 
-      &:active { background: bg-color(4); color: $accent_color; }
+      &:active { background: bg-color(3); color: $accent_color; }
 
       &.has-open-popup { background: bg-color(3); color: $accent_color; }
     }

diff --git a/Helium/gtk-4.0/widgets/_sidebars.scss b/Helium/gtk-4.0/widgets/_sidebars.scss
@@ -120,9 +120,9 @@ placessidebar {
       &:active { background: bg-color(2); color: $accent_fg_color; }
 
       &:selected {
-        &:hover { background: bg-color(3); color: $accent_fg_color; }
+        &:hover { background: bg-color(2); color: $accent_fg_color; }
 
-        &:active { background: bg-color(4); color: $accent_fg_color; }
+        &:active { background: bg-color(3); color: $accent_fg_color; }
       }
     }
 

diff --git a/Helium/gtk-4.0/widgets/_views.scss b/Helium/gtk-4.0/widgets/_views.scss
@@ -53,7 +53,7 @@ iconview {
 
 rubberband {
   border: 1px solid $accent_color;
-  background: bg-color(4);
+  background: bg-color(3);
 }
 
 flowbox > flowboxchild,
@@ -65,7 +65,7 @@ gridview > child {
   @include focus-ring();
 
   &:selected {
-    background: bg-color(4); color: $accent_fg_color;
+    background: bg-color(3); color: $accent_fg_color;
   }
 }
 
@@ -75,8 +75,8 @@ gridview > child.activatable {
   &:active { background: bg-color(2); color: $accent_fg_color; }
 
   &:selected {
-    &:hover { background: bg-color(3); color: $accent_fg_color; }
+    &:hover { background: bg-color(2); color: $accent_fg_color; }
 
-    &:active { background: bg-color(4); color: $accent_fg_color; }
+    &:active { background: bg-color(3); color: $accent_fg_color; }
   }
 }