update for scheme refactor

This commit is contained in:
2 * r + 2 * t 2025-03-07 19:42:14 +11:00
parent ab80d8f786
commit 630885daab
5 changed files with 25 additions and 9 deletions

View file

@ -33,7 +33,7 @@
} }
&.normal { &.normal {
@include popup(scheme.$accent, 0.3); @include popup(scheme.$primary, 0.3);
} }
&.critical { &.critical {

View file

@ -32,8 +32,8 @@
} }
&.normal { &.normal {
@include lib.border(scheme.$accent, 0.3); @include lib.border(scheme.$primary, 0.3);
@include popup(scheme.$accent); @include popup(scheme.$primary);
} }
&.critical { &.critical {

View file

@ -26,4 +26,6 @@ $mantle: #21242b;
$crust: #1e2126; $crust: #1e2126;
$success: #98c379; $success: #98c379;
$error: #be5046; $error: #be5046;
$accent: #d19a66; $primary: #d19a66;
$secondary: #61afef;
$tertiary: #98c379;

View file

@ -258,7 +258,7 @@ const Scheme = ({ scheme, name, colours }: { scheme?: string; name: string; colo
<box> <box>
<box valign={Gtk.Align.CENTER}> <box valign={Gtk.Align.CENTER}>
<box className="swatch big left" css={"background-color: " + palette.base + ";"} /> <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>
<box vertical className="has-sublabel"> <box vertical className="has-sublabel">
<label truncate xalign={0} label={scheme ? `${scheme} (${name})` : name} /> <label truncate xalign={0} label={scheme ? `${scheme} (${name})` : name} />

View file

@ -32,7 +32,9 @@ export interface IPalette {
base: Hex; base: Hex;
mantle: Hex; mantle: Hex;
crust: Hex; crust: Hex;
accent: Hex; primary: Hex;
secondary: Hex;
tertiary: Hex;
} }
@register({ GTypeName: "Palette" }) @register({ GTypeName: "Palette" })
@ -200,8 +202,18 @@ export default class Palette extends GObject.Object {
} }
@property(String) @property(String)
get accent() { get primary() {
return this.#colours.accent; return this.#colours.primary;
}
@property(String)
get secondary() {
return this.#colours.secondary;
}
@property(String)
get tertiary() {
return this.#colours.tertiary;
} }
#notify() { #notify() {
@ -232,7 +244,9 @@ export default class Palette extends GObject.Object {
this.notify("base"); this.notify("base");
this.notify("mantle"); this.notify("mantle");
this.notify("crust"); this.notify("crust");
this.notify("accent"); this.notify("primary");
this.notify("secondary");
this.notify("tertiary");
} }
update() { update() {