diff options
| author | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-03-07 19:42:14 +1100 |
|---|---|---|
| committer | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-03-07 19:42:14 +1100 |
| commit | 630885daab9bae4ed8fd911fee1b51e4241f7bd7 (patch) | |
| tree | da6ddb3c83a98a27329371dada53a7d3a92f5f9a | |
| parent | launcher: fixes (diff) | |
| download | caelestia-shell-630885daab9bae4ed8fd911fee1b51e4241f7bd7.tar.gz caelestia-shell-630885daab9bae4ed8fd911fee1b51e4241f7bd7.tar.bz2 caelestia-shell-630885daab9bae4ed8fd911fee1b51e4241f7bd7.zip | |
update for scheme refactor
| -rw-r--r-- | scss/notifpopups.scss | 2 | ||||
| -rw-r--r-- | scss/popdowns/notifications.scss | 4 | ||||
| -rw-r--r-- | scss/scheme/_default.scss | 4 | ||||
| -rw-r--r-- | src/modules/launcher/actions.tsx | 2 | ||||
| -rw-r--r-- | src/services/palette.ts | 22 |
5 files changed, 25 insertions, 9 deletions
diff --git a/scss/notifpopups.scss b/scss/notifpopups.scss index 74c5118..c4760b7 100644 --- a/scss/notifpopups.scss +++ b/scss/notifpopups.scss @@ -33,7 +33,7 @@ } &.normal { - @include popup(scheme.$accent, 0.3); + @include popup(scheme.$primary, 0.3); } &.critical { diff --git a/scss/popdowns/notifications.scss b/scss/popdowns/notifications.scss index b328a7c..e992f50 100644 --- a/scss/popdowns/notifications.scss +++ b/scss/popdowns/notifications.scss @@ -32,8 +32,8 @@ } &.normal { - @include lib.border(scheme.$accent, 0.3); - @include popup(scheme.$accent); + @include lib.border(scheme.$primary, 0.3); + @include popup(scheme.$primary); } &.critical { diff --git a/scss/scheme/_default.scss b/scss/scheme/_default.scss index 2e1ea2c..71ea197 100644 --- a/scss/scheme/_default.scss +++ b/scss/scheme/_default.scss @@ -26,4 +26,6 @@ $mantle: #21242b; $crust: #1e2126; $success: #98c379; $error: #be5046; -$accent: #d19a66; +$primary: #d19a66; +$secondary: #61afef; +$tertiary: #98c379; diff --git a/src/modules/launcher/actions.tsx b/src/modules/launcher/actions.tsx index ffbd4b1..05005a4 100644 --- a/src/modules/launcher/actions.tsx +++ b/src/modules/launcher/actions.tsx @@ -258,7 +258,7 @@ const Scheme = ({ scheme, name, colours }: { scheme?: string; name: string; colo <box> <box valign={Gtk.Align.CENTER}> <box className="swatch big left" css={"background-color: " + palette.base + ";"} /> - <box className="swatch big right" css={"background-color: " + palette.accent + ";"} /> + <box className="swatch big right" css={"background-color: " + palette.primary + ";"} /> </box> <box vertical className="has-sublabel"> <label truncate xalign={0} label={scheme ? `${scheme} (${name})` : name} /> diff --git a/src/services/palette.ts b/src/services/palette.ts index 95915c0..952543f 100644 --- a/src/services/palette.ts +++ b/src/services/palette.ts @@ -32,7 +32,9 @@ export interface IPalette { base: Hex; mantle: Hex; crust: Hex; - accent: Hex; + primary: Hex; + secondary: Hex; + tertiary: Hex; } @register({ GTypeName: "Palette" }) @@ -200,8 +202,18 @@ export default class Palette extends GObject.Object { } @property(String) - get accent() { - return this.#colours.accent; + get primary() { + return this.#colours.primary; + } + + @property(String) + get secondary() { + return this.#colours.secondary; + } + + @property(String) + get tertiary() { + return this.#colours.tertiary; } #notify() { @@ -232,7 +244,9 @@ export default class Palette extends GObject.Object { this.notify("base"); this.notify("mantle"); this.notify("crust"); - this.notify("accent"); + this.notify("primary"); + this.notify("secondary"); + this.notify("tertiary"); } update() { |