|
| 1 | +From bf4d2b033afb504fcda61cbc5865bbf27548b051 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Jamie Lee < [email protected]> |
| 3 | +Date: Fri, 8 Apr 2022 16:27:54 -0700 |
| 4 | +Subject: [PATCH] Add accent colours |
| 5 | + |
| 6 | +--- |
| 7 | + gtk/src/adw-gtk3/gtk-3.0/_colors.scss | 12 +++++++----- |
| 8 | + gtk/src/adw-gtk3/gtk-3.0/_libhandy.scss | 2 +- |
| 9 | + gtk/src/adw-gtk3/gtk-3.0/_palette.scss | 9 +++++++++ |
| 10 | + 3 files changed, 17 insertions(+), 6 deletions(-) |
| 11 | + |
| 12 | +diff --git a/gtk/src/adw-gtk3/gtk-3.0/_colors.scss b/gtk/src/adw-gtk3/gtk-3.0/_colors.scss |
| 13 | +index 20785b0..0b6b810 100644 |
| 14 | +--- a/gtk/src/adw-gtk3/gtk-3.0/_colors.scss |
| 15 | ++++ b/gtk/src/adw-gtk3/gtk-3.0/_colors.scss |
| 16 | +@@ -6,8 +6,9 @@ $text_color: if($variant == 'light', black, white); |
| 17 | + $bg_color: if($variant == 'light', #fafafa, #242424); |
| 18 | + $fg_color: if($variant == 'light', transparentize(black, .2), white); |
| 19 | + |
| 20 | +-$selected_fg_color: #ffffff; |
| 21 | +-$selected_bg_color: if($variant == 'light', $blue_3, $blue_3); |
| 22 | ++$selected_fg_color: $accent_fg_color; |
| 23 | ++$selected_bg_color: if($variant == 'light', $accent_bg_color, darken($accent_bg_color, 4%)); |
| 24 | ++ |
| 25 | + $selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%)); |
| 26 | + $borders_color: if($variant == 'light', darken($bg_color, 17%), lighten($bg_color, 16.7%)); //#cfcfcf, #4f4f4f |
| 27 | + $alt_borders_color: if($variant == 'light', darken($bg_color, 24%), darken($bg_color, 18%)); |
| 28 | +@@ -70,11 +71,12 @@ $backdrop_menu_color: if($variant == 'light', $backdrop_base_color, mix($backdro |
| 29 | + //special cased widget colors |
| 30 | + $suggested_bg_color: $selected_bg_color; |
| 31 | + $suggested_border_color: $selected_borders_color; |
| 32 | +-$progress_bg_color: $selected_bg_color; |
| 33 | ++$progress_bg_color: $accent_bg_color; |
| 34 | + $progress_border_color: $selected_borders_color; |
| 35 | +-$checkradio_bg_color: $selected_bg_color; |
| 36 | +-$checkradio_fg_color: $selected_fg_color; |
| 37 | ++$checkradio_bg_color: $accent_bg_color; |
| 38 | ++$checkradio_fg_color: $accent_fg_color; |
| 39 | + $checkradio_borders_color: if($variant == 'light', darken($checkradio_bg_color,20%), darken($checkradio_bg_color,40%)); |
| 40 | ++$focus_border_color: transparentize(lighten($accent_bg_color, 14%), 0.3); |
| 41 | + |
| 42 | + // titlebuttons |
| 43 | + $titlebutton_normal: if($variant == 'light', darken($headerbar_color, 7%), lighten($headerbar_color, 8%)); |
| 44 | +diff --git a/gtk/src/adw-gtk3/gtk-3.0/_libhandy.scss b/gtk/src/adw-gtk3/gtk-3.0/_libhandy.scss |
| 45 | +index 29bf094..438e054 100644 |
| 46 | +--- a/gtk/src/adw-gtk3/gtk-3.0/_libhandy.scss |
| 47 | ++++ b/gtk/src/adw-gtk3/gtk-3.0/_libhandy.scss |
| 48 | +@@ -413,7 +413,7 @@ viewswitcher { |
| 49 | + |
| 50 | + > stack > box label { |
| 51 | + animation: needs_attention 150ms ease-in; |
| 52 | +- background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to($selected_bg_color), to(transparent)); |
| 53 | ++ background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to($accent_bg_color), to(transparent)); |
| 54 | + background-size: 6px 6px, 6px 6px; |
| 55 | + background-repeat: no-repeat; |
| 56 | + background-position: right 0px, right 1px; |
| 57 | +diff --git a/gtk/src/adw-gtk3/gtk-3.0/_palette.scss b/gtk/src/adw-gtk3/gtk-3.0/_palette.scss |
| 58 | +index 414decf..8da6438 100644 |
| 59 | +--- a/gtk/src/adw-gtk3/gtk-3.0/_palette.scss |
| 60 | ++++ b/gtk/src/adw-gtk3/gtk-3.0/_palette.scss |
| 61 | +@@ -43,6 +43,10 @@ $dark_2: #5e5c64; |
| 62 | + $dark_3: #3d3846; |
| 63 | + $dark_4: #241f31; |
| 64 | + $dark_5: #000000; |
| 65 | ++$Tau: #8C56BF; |
| 66 | ++$accent_color: $Tau; |
| 67 | ++$accent_bg_color: $Tau; |
| 68 | ++$accent_fg_color: $light_1; |
| 69 | + |
| 70 | + // Sass thinks we're using the colors in the variables as strings and may shoot |
| 71 | + // warning, it's innocuous and can be defeated by using #{$var}. |
| 72 | +@@ -93,3 +97,8 @@ $dark_5: #000000; |
| 73 | + @define-color dark_4 #{$dark_4}; |
| 74 | + @define-color dark_5 #{$dark_5}; |
| 75 | + |
| 76 | ++@define-color Tau #{$Tau}; |
| 77 | ++@define-color accent_color #{$Tau}; |
| 78 | ++@define-color accent_bg_color #{$Tau}; |
| 79 | ++@define-color accent_fg_color #{$light_1}; |
| 80 | ++ |
| 81 | +-- |
| 82 | +2.35.1 |
| 83 | + |
0 commit comments