From 11767c30097c5553ae4ffd261651b0b5ddf2b824 Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Fri, 9 Jan 2026 16:04:51 +0100 Subject: [PATCH] [Astal] Prepare for reloadable style --- config/astal/app.ts | 5 ++++ config/astal/util/colours.scss | 4 +-- config/hypr/hyprland/colors.conf | 4 +-- config/hypr/hyprlock.conf | 4 +-- config/rofi/style.rasi | 6 ++--- config/wlogout/style.css | 4 +-- gtk-theme/dist/colours.css | 44 ++++++++++++++++---------------- 7 files changed, 38 insertions(+), 33 deletions(-) diff --git a/config/astal/app.ts b/config/astal/app.ts index 92b46b4..5154798 100644 --- a/config/astal/app.ts +++ b/config/astal/app.ts @@ -93,8 +93,13 @@ App.start( { res( 'No controllable screen available' ); } } catch ( e ) { + print( e ); res( 'Error running brightness change' ); } + } else if ( args[ 0 ] === 'reload-style' ) { + res( 'Reloading style sheets' ); + App.apply_css( '', true ); + // TODO: Compile scss and then load it } // } else if ( args[ 0 ] === 'launcher' ) { // if ( args[ 1 ] === 'show' ) { diff --git a/config/astal/util/colours.scss b/config/astal/util/colours.scss index 7562119..223bde7 100644 --- a/config/astal/util/colours.scss +++ b/config/astal/util/colours.scss @@ -1,6 +1,6 @@ $fg-color: #C8DCFF; $bg-color: #0A0A0F; -$accent-color: #591641; -$accent-color-2: #97103A; +$accent-color: #465B4E; +$accent-color-2: #324E12; $shadow-color: rgba(0, 0, 2, 0.3); $monospace-font: Source Code Pro diff --git a/config/hypr/hyprland/colors.conf b/config/hypr/hyprland/colors.conf index 39354f2..3291769 100644 --- a/config/hypr/hyprland/colors.conf +++ b/config/hypr/hyprland/colors.conf @@ -4,10 +4,10 @@ # ╰────────────────────────────────────────────────╯ # ──────────────────────────────────────────────────────────────────── -exec = swaybg -m fill -i /home/janis/NextCloud/Wallpapers/dark/colour-explosion.jpg +exec = swaybg -m fill -i /home/janis/NextCloud/Wallpapers/hypercar/peugeot_9x8.jpg general { - col.active_border = rgba(591641cc) rgba(97103acc) rgba(2d2057cc) 45deg + col.active_border = rgba(465b4ecc) rgba(324e12cc) rgba(19301ecc) 45deg col.inactive_border = rgb(000000) } diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index 56f7476..728b1a1 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -14,7 +14,7 @@ # └ ┘ background { monitor = - path = /home/janis/NextCloud/Wallpapers/dark/mountains.jpg # Or screenshot + path = /home/janis/NextCloud/Wallpapers/hypercar/ferrari_499p-closeup.jpg # Or screenshot blur_passes = 1 } @@ -29,7 +29,7 @@ input-field { dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8 dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0 dots_center = false - outer_color = rgb(89, 22, 65) + outer_color = rgb(70, 91, 78) inner_color = rgb(200, 200, 200) font_color = rgb(10, 10, 10) fade_on_empty = true diff --git a/config/rofi/style.rasi b/config/rofi/style.rasi index bc9c568..5a9fa65 100644 --- a/config/rofi/style.rasi +++ b/config/rofi/style.rasi @@ -2,9 +2,9 @@ background: #0A0A0F; background-selected: #141419; foreground: #C8DCFF; - accent: #591641; - accent-two: #97103A; - // border-color: #2D2057; + accent: #465B4E; + accent-two: #324E12; + // border-color: #19301E; inactive: #C8C8C8; spacing: 2; width: 30em; diff --git a/config/wlogout/style.css b/config/wlogout/style.css index 71cc951..6bd2a90 100644 --- a/config/wlogout/style.css +++ b/config/wlogout/style.css @@ -22,11 +22,11 @@ button { } button:hover { - background-color: rgba(151, 16, 58, 0.5); + background-color: rgba(50, 78, 18, 0.5); } button:focus { - background-color: rgb(151, 16, 58); + background-color: rgb(50, 78, 18); color: rgb(200, 220, 255); } diff --git a/gtk-theme/dist/colours.css b/gtk-theme/dist/colours.css index f481a68..b1b0a7e 100644 --- a/gtk-theme/dist/colours.css +++ b/gtk-theme/dist/colours.css @@ -40,40 +40,40 @@ /* * ── Accent colour ──────────────────────────────────────────────────── */ -@define-color accent #591641; -@define-color accent_rgba_05 rgba(89, 22, 65, 0.5); -@define-color accent_rgba_03 rgba(89, 22, 65, 0.3); -@define-color accent_rgba_02 rgba(89, 22, 65, 0.2); -@define-color accent_rgba_015 rgba(89, 22, 65, 0.15); -@define-color accent_rgba_011 rgba(89, 22, 65, 0.11); -@define-color accent_rgba_007 rgba(89, 22, 65, 0.07); +@define-color accent #465B4E; +@define-color accent_rgba_05 rgba(70, 91, 78, 0.5); +@define-color accent_rgba_03 rgba(70, 91, 78, 0.3); +@define-color accent_rgba_02 rgba(70, 91, 78, 0.2); +@define-color accent_rgba_015 rgba(70, 91, 78, 0.15); +@define-color accent_rgba_011 rgba(70, 91, 78, 0.11); +@define-color accent_rgba_007 rgba(70, 91, 78, 0.07); /* * ── Accent Gradient ────────────────────────────────────────────────── */ -@define-color accent_gradient_1 #481235; -@define-color accent_gradient_2 #41102F; -@define-color accent_gradient_3 #3A0E2B; -@define-color accent_gradient_4 #350D26; -@define-color accent_gradient_5 #2F0C23; -@define-color accent_gradient_inverse_1 #6E1B50; -@define-color accent_gradient_inverse_2 #6E1B50; -@define-color accent_gradient_inverse_3 #6E1B50; +@define-color accent_gradient_1 #394A3F; +@define-color accent_gradient_2 #334239; +@define-color accent_gradient_3 #2E3C33; +@define-color accent_gradient_4 #29362E; +@define-color accent_gradient_5 #253029; +@define-color accent_gradient_inverse_1 #567060; +@define-color accent_gradient_inverse_2 #567060; +@define-color accent_gradient_inverse_3 #567060; /* * ── Secondary accent colour ────────────────────────────────────────── */ -@define-color accent2 #97103A; -@define-color accent2_rgba_05 rgba(151, 16, 58, 0.5); -@define-color accent2_rgba_03 rgba(151, 16, 58, 0.3); -@define-color accent2_rgba_02 rgba(151, 16, 58, 0.2); -@define-color accent2_rgba_015 rgba(151, 16, 58, 0.15); -@define-color accent2_rgba_01 rgba(151, 16, 58, 0.1); +@define-color accent2 #324E12; +@define-color accent2_rgba_05 rgba(50, 78, 18, 0.5); +@define-color accent2_rgba_03 rgba(50, 78, 18, 0.3); +@define-color accent2_rgba_02 rgba(50, 78, 18, 0.2); +@define-color accent2_rgba_015 rgba(50, 78, 18, 0.15); +@define-color accent2_rgba_01 rgba(50, 78, 18, 0.1); /* * ── Tertiary accent colour ─────────────────────────────────────────── */ -@define-color accent3 #2D2057; +@define-color accent3 #19301E; /* * ── Inactive Colour ──────────────────────────────────────────────────