feat!: combine `Primary`, `Secondary`, `Tertiary` and `Error`

Now only a singular `ColorQuartet` struct exists.

Also rename some `Surface` and `Inverse` fields for consistency.

1 files changed, 5 insertions, 7 deletions

diff --git a/src/slider.rs b/src/slider.rs
index ae9ee4b..2146acb 100644
--- a/src/slider.rs
+++ b/src/slider.rs
@@ -46,17 +46,15 @@ pub fn default(theme: &Theme, status: Status) -> Style {
     let secondary = theme.colors().secondary;
 
     match status {
-        Status::Active => {
-            styled(primary.color, secondary.secondary_container, 12.0)
-        }
+        Status::Active => styled(primary.color, secondary.container, 12.0),
         Status::Hovered => styled(
-            mix(primary.color, surface.on_surface, HOVERED_LAYER_OPACITY),
-            secondary.secondary_container,
+            mix(primary.color, surface.text, HOVERED_LAYER_OPACITY),
+            secondary.container,
             12.0,
         ),
         Status::Dragged => styled(
-            mix(primary.color, surface.on_surface, PRESSED_LAYER_OPACITY),
-            secondary.secondary_container,
+            mix(primary.color, surface.text, PRESSED_LAYER_OPACITY),
+            secondary.container,
             11.0,
         ),
     }