Update color defs to match icon theme (mamolinux#56)

hsbasu · Aug 6, 2023 · 343968a · 343968a
1 parent d64af32
commit 343968a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 29 deletions.
diff --git a/common/accent-colors.scss.in b/common/accent-colors.scss.in
@@ -11,13 +11,13 @@
     } @else if $accent_color == 'grey' {
         $color: #9d9d9d;
     } @else if $accent_color == 'orange' {
-        $color: #E95420;
+        $color: #e95420;
     } @else if $accent_color == 'pink' {
         $color: #c76199;
     } @else if $accent_color == 'purple' {
         $color: #8c6ec9;
     } @else if $accent_color == 'red' {
-        $color: #DA3450;
+        $color: #da3450;
     } @else if $accent_color == 'sand' {
         $color: #c8ac69;
     } @else if $accent_color == 'teal' {

diff --git a/common/sucharu-colors-defs.scss b/common/sucharu-colors-defs.scss
@@ -8,16 +8,16 @@ $variant: if($sucharu_is_dark_variant, 'dark', 'light');
 $sucharu_colors: (
     bg-color: $bg_color,
     accent-bg-color: $sucharu_accent_bg_color,
-    accent-active-color: $progress_bg_color,
-    accent-focused-color: if($variant == 'dark', darken($accent_bg_color, 7%), darken($accent_bg_color, 3%)),
+    accent-active-color: if($variant == 'light', darken($accent_bg_color, 15%), darken($accent_bg_color, 20%)),
+    accent-focused-color: if($variant == 'light', lighten($accent_bg_color, 10%), lighten($accent_bg_color, 7%)),
     border-color: $borders_color,
     disabled-bg-color: mix($bg_color, $fg_color, 80%),
-    switch-bg-color: if($variant == 'dark', lighten($inkstone, 5%), lighten($ash, 20%)),
-    check-bg-color: if($variant == 'dark', lighten($bg_color, 2%), $porcelain),
+    switch-bg-color: if($variant == 'light', lighten($ash, 20%), lighten($inkstone, 5%)),
+    check-bg-color: if($variant == 'light', $porcelain, lighten($bg_color, 2%)),
 );
 
 $sucharu_colors: map-merge($sucharu_colors, (
-    accent-border-color: lighten(map-get($sucharu_colors, accent-active-color), 17%),
+    accent-border-color: lighten(map-get($sucharu_colors, accent-active-color), 35%),
 ));
 
 @function opaque-color($color, $background: $bg_color) {

diff --git a/test-sucharu b/test-sucharu
@@ -6,25 +6,3 @@ rm -rf builddir
 meson -Dprefix=$HOME/.local builddir
 meson compile -C builddir
 meson install -C builddir
-
-# gsettings set org.cinnamon.theme name 'Sucharu'
-gsettings set org.cinnamon.desktop.interface gtk-theme 'Sucharu'
-gsettings set org.gnome.desktop.interface gtk-theme 'Sucharu'
-sleep 5
-gsettings set org.cinnamon.desktop.interface gtk-theme 'Sucharu-darker'
-gsettings set org.gnome.desktop.interface gtk-theme 'Sucharu-darker'
-sleep 5
-# gsettings set org.cinnamon.theme name 'Sucharu-dark'
-gsettings set org.cinnamon.desktop.interface gtk-theme 'Sucharu-dark'
-gsettings set org.gnome.desktop.interface gtk-theme 'Sucharu-dark'
-sleep 5
-# gsettings set org.cinnamon.theme name 'Sucharu-aqua'
-gsettings set org.cinnamon.desktop.interface gtk-theme 'Sucharu-aqua'
-gsettings set org.gnome.desktop.interface gtk-theme 'Sucharu-aqua'
-sleep 5
-gsettings set org.cinnamon.desktop.interface gtk-theme 'Sucharu-aqua-darker'
-gsettings set org.gnome.desktop.interface gtk-theme 'Sucharu-aqua-darker'
-sleep 5
-# gsettings set org.cinnamon.theme name 'Sucharu-aqua-dark'
-gsettings set org.cinnamon.desktop.interface gtk-theme 'Sucharu-aqua-dark'
-gsettings set org.gnome.desktop.interface gtk-theme 'Sucharu-aqua-dark'