Merge branch 'main' into fix/textfield-color

tau-OS · Feb 11, 2024 · 266a432 · 266a432
2 parents 8743235 + 8c96607
commit 266a432
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/Helium/gtk-3.0/_colors.scss b/Helium/gtk-3.0/_colors.scss
@@ -121,11 +121,11 @@ $titlebutton_backdrop_hover: gtkalpha(currentColor, .15);
 $border_color: gtkalpha(currentColor, .15); // not the same as borderS-color
 
 // fixme: Text selection contrast is basically invisible
-$view_hover_color: gtkalpha(currentColor, .7);
-$view_active_color: gtkalpha(currentColor, .16);
-$view_selected_color: gtkalpha(currentColor, .5);
-$view_selected_hover_color: gtkalpha(currentColor, .5);
-$view_selected_active_color: gtkalpha(currentColor, .5);
+$view_hover_color: gtkalpha(currentColor, .9);
+$view_active_color: gtkalpha(currentColor, .85);
+$view_selected_color: gtkalpha(currentColor, .8);
+$view_selected_hover_color: gtkalpha(currentColor, .85);
+$view_selected_active_color: gtkalpha(currentColor, .9);
 
 $trough_color: gtkalpha(currentColor, .15);
 $trough_hover_color: gtkalpha(currentColor, .2);

diff --git a/Helium/gtk-3.0/widgets/_base.scss b/Helium/gtk-3.0/widgets/_base.scss
@@ -15,9 +15,9 @@ $border_opacity: 0.12;
 $caret_color: if($variant == 'light', gtkshade($text_color, 1.05), gtkshade($text_color, 0.97));
 $hover_color: gtkalpha(currentColor, .08);
 $active_color: gtkalpha(currentColor, .14);
-$selected_color: gtkalpha(currentColor, .14);
-$selected_hover_color: gtkalpha(currentColor, .15);
-$selected_active_color: gtkalpha(currentColor, .38);
+$selected_color: gtkalpha(currentColor, .5);
+$selected_hover_color: gtkalpha(currentColor, .5);
+$selected_active_color: gtkalpha(currentColor, .5);
 $sidebar_bg_color: gtkcolor(sidebar_bg_color);
 $sidebar_fg_color: gtkcolor(sidebar_fg_color);
 $sidebar_backdrop_color: gtkcolor(sidebar_backdrop_color);
@@ -178,14 +178,14 @@ spinner {
 
     @at-root %selected_items_disabled,
     &:disabled {
-      //color: gtkmix($selected_fg_color, $selected_bg_color, 50%);
+      color: gtkmix($selected_fg_color, $selected_bg_color, 50%);
     }
 
     @at-root %selected_items_backdrop,
     &:backdrop {
-      //color: $selected_fg_color;
+      color: $selected_fg_color;
 
-      //&:disabled { color: gtkmix($backdrop_selected_fg_color, $selected_bg_color, 30%); }
+      &:disabled { color: gtkmix($backdrop_selected_fg_color, $selected_bg_color, 30%); }
     }
   }
 }