[libadwaita/wip/exalm/buttons-5: 16/20] stylesheet: Use currentColor instead of text color
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libadwaita/wip/exalm/buttons-5: 16/20] stylesheet: Use currentColor instead of text color
- Date: Fri, 11 Jun 2021 08:48:51 +0000 (UTC)
commit 4133dfd62112b35e8c8d0bc32744981582d21f44
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Thu Jun 10 23:12:10 2021 +0500
stylesheet: Use currentColor instead of text color
Make things more recolorable. We'll need this for the new button style.
src/stylesheet/_colors.scss | 18 +++++++++---------
src/stylesheet/widgets/_scale.scss | 10 ----------
src/stylesheet/widgets/_trees.scss | 3 ++-
3 files changed, 11 insertions(+), 20 deletions(-)
---
diff --git a/src/stylesheet/_colors.scss b/src/stylesheet/_colors.scss
index 1da4f989..0d626ea3 100644
--- a/src/stylesheet/_colors.scss
+++ b/src/stylesheet/_colors.scss
@@ -18,15 +18,15 @@ $dark_fill: mix($borders_color, $bg_color, 50%);
$headerbar_bg_color: if($variant == 'light', lighten($bg_color, 5%), darken($bg_color, 3%));
$menu_color: $base_color;
-$view_hover_color: transparentize($text_color, .93);
-$view_active_color: transparentize($text_color, .84);
-$view_selected_color: transparentize($text_color, .9);
-$view_selected_hover_color: transparentize($text_color, .87);
-$view_selected_active_color: transparentize($text_color, .81);
-
-$trough_color: transparentize($text_color, .85);
-$trough_hover_color: transparentize($text_color, .8);
-$trough_active_color: transparentize($text_color, .75);
+$view_hover_color: #{"alpha(currentColor, .07)"};
+$view_active_color: #{"alpha(currentColor, .16)"};
+$view_selected_color: #{"alpha(currentColor, .1)"};
+$view_selected_hover_color: #{"alpha(currentColor, .13)"};
+$view_selected_active_color: #{"alpha(currentColor, .19)"};
+
+$trough_color: #{"alpha(currentColor, .15)"};
+$trough_hover_color: #{"alpha(currentColor, .2)"};
+$trough_active_color: #{"alpha(currentColor, .25)"};
$fill_color: $selected_bg_color;
$fill_text_color: $selected_fg_color;
diff --git a/src/stylesheet/widgets/_scale.scss b/src/stylesheet/widgets/_scale.scss
index 8baf8241..041428be 100644
--- a/src/stylesheet/widgets/_scale.scss
+++ b/src/stylesheet/widgets/_scale.scss
@@ -5,11 +5,6 @@
@if $contrast == "high" {
box-shadow: inset 0 0 0 1px $borders_color;
}
-
- // OSD
- .osd & {
- background-color: transparentize($osd_text_color, .85);
- }
}
%scale_highlight {
@@ -39,11 +34,6 @@ scale {
// in media player to indicate how much video stream as been cached
> fill {
@extend %scale_trough;
-
- // OSD
- .osd & {
- background-color: mix($osd_fg_color, $osd_borders_color, 25%);
- }
}
> slider {
diff --git a/src/stylesheet/widgets/_trees.scss b/src/stylesheet/widgets/_trees.scss
index 38a47923..66d3a7af 100644
--- a/src/stylesheet/widgets/_trees.scss
+++ b/src/stylesheet/widgets/_trees.scss
@@ -1,5 +1,6 @@
// To be used for opaque elements overlaid atop the selected row
-$treeview_selection_opaque: mix(opacify($view_selected_color, 1), $base_color, 100% *
alpha($view_selected_color));
+$treeview_selection_default: transparentize($text_color, .9);
+$treeview_selection_opaque: mix(opacify($treeview_selection_default, 1), $base_color, 100% *
alpha($treeview_selection_default));
columnview.view,
treeview.view {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]