diff --git a/components/Palette.slint b/components/Palette.slint index a3fbc82..0a69cb2 100644 --- a/components/Palette.slint +++ b/components/Palette.slint @@ -29,7 +29,7 @@ // ---- export global Palette { - in-out property accent: #56b6c2; + in-out property accent: Colors.cyan.darker(0.4); in-out property foreground: #abb2bf; in-out property foreground-hint: foreground.darker(0.2); in-out property background: #282c34; @@ -38,8 +38,8 @@ export global Palette { in-out property popup-border: Colors.grey; in-out property control-foreground: #abb2bf; in-out property control-background: #393f4a; - in-out property card-background: #3b3f4c; - in-out property green: #98c379; - in-out property orange: #d19a66; - in-out property red: #e86671; + in-out property card-background: background.brighter(0.2); + in-out property green: Colors.greenyellow; + in-out property orange: Colors.orange; + in-out property red: Colors.red; } diff --git a/components/Tag.slint b/components/Tag.slint index 35ace09..6180058 100644 --- a/components/Tag.slint +++ b/components/Tag.slint @@ -4,24 +4,14 @@ import { VText } from "Text.slint"; export component VTag inherits Rectangle { in property text <=> text-component.text; - in property text-color; + in property text-color <=> text-component.color; in property size <=> text-component.font-size; in property background-color <=> self.background; callback clicked; - background: Palette.card-background; - border-radius: 8phx; - clip: true; - border-color: text-color; - border-width: 1phx; - - Rectangle { - width: 100%; - height: 100%; - background: root.text-color; - opacity: 0.05; - } + background: Palette.control-background; + border-radius: 8px; ta := TouchArea { mouse-cursor: pointer; diff --git a/cpp/include/selenite/palette.h b/cpp/include/selenite/palette.h index db099e5..eabf912 100644 --- a/cpp/include/selenite/palette.h +++ b/cpp/include/selenite/palette.h @@ -27,6 +27,4 @@ struct Palette { std::optional parseJson(const std::string &path); -Color hexStringToColor(const std::string &hexString); - } // namespace selenite