From d5bf9e1addd7ca75c22950f027598921cc21c238 Mon Sep 17 00:00:00 2001 From: Sacha Van den Wyngaert Date: Wed, 11 Jan 2023 21:16:40 +0100 Subject: [PATCH] refactor: deduplicate palette colors --- scss/_frappe.scss | 56 ++++++++++++++++++++++++-------------------- scss/_latte.scss | 56 ++++++++++++++++++++++++-------------------- scss/_macchiato.scss | 56 ++++++++++++++++++++++++-------------------- scss/_mocha.scss | 56 ++++++++++++++++++++++++-------------------- 4 files changed, 120 insertions(+), 104 deletions(-) diff --git a/scss/_frappe.scss b/scss/_frappe.scss index 49485fc..ccd35f2 100644 --- a/scss/_frappe.scss +++ b/scss/_frappe.scss @@ -1,26 +1,30 @@ -$rosewater: #f2d5cf; -$flamingo: #eebebe; -$pink: #f4b8e4; -$mauve: #ca9ee6; -$red: #e78284; -$maroon: #ea999c; -$peach: #ef9f76; -$yellow: #e5c890; -$green: #a6d189; -$teal: #81c8be; -$sky: #99d1db; -$sapphire: #85c1dc; -$blue: #8caaee; -$lavender: #babbf1; -$text: #c6d0f5; -$subtext1: #b5bfe2; -$subtext0: #a5adce; -$overlay2: #949cbb; -$overlay1: #838ba7; -$overlay0: #737994; -$surface2: #626880; -$surface1: #51576d; -$surface0: #414559; -$base: #303446; -$mantle: #292c3c; -$crust: #232634; +@use "catppuccin"; + +$flavour: map-get(catppuccin.$palette, "frappe"); + +$rosewater: map-get($flavour, "rosewater"); +$flamingo: map-get($flavour, "flamingo"); +$pink: map-get($flavour, "pink"); +$mauve: map-get($flavour, "mauve"); +$red: map-get($flavour, "red"); +$maroon: map-get($flavour, "maroon"); +$peach: map-get($flavour, "peach"); +$yellow: map-get($flavour, "yellow"); +$green: map-get($flavour, "green"); +$teal: map-get($flavour, "teal"); +$sky: map-get($flavour, "sky"); +$sapphire: map-get($flavour, "sapphire"); +$blue: map-get($flavour, "blue"); +$lavender: map-get($flavour, "lavender"); +$text: map-get($flavour, "text"); +$subtext1: map-get($flavour, "subtext1"); +$subtext0: map-get($flavour, "subtext0"); +$overlay2: map-get($flavour, "overlay2"); +$overlay1: map-get($flavour, "overlay1"); +$overlay0: map-get($flavour, "overlay0"); +$surface2: map-get($flavour, "surface2"); +$surface1: map-get($flavour, "surface1"); +$surface0: map-get($flavour, "surface0"); +$base: map-get($flavour, "base"); +$mantle: map-get($flavour, "mantle"); +$crust: map-get($flavour, "crust"); diff --git a/scss/_latte.scss b/scss/_latte.scss index c1a01ca..d9ac1cb 100644 --- a/scss/_latte.scss +++ b/scss/_latte.scss @@ -1,26 +1,30 @@ -$rosewater: #dc8a78; -$flamingo: #dd7878; -$pink: #ea76cb; -$mauve: #8839ef; -$red: #d20f39; -$maroon: #e64553; -$peach: #fe640b; -$yellow: #df8e1d; -$green: #40a02b; -$teal: #179299; -$sky: #04a5e5; -$sapphire: #209fb5; -$blue: #1e66f5; -$lavender: #7287fd; -$text: #4c4f69; -$subtext1: #5c5f77; -$subtext0: #6c6f85; -$overlay2: #7c7f93; -$overlay1: #8c8fa1; -$overlay0: #9ca0b0; -$surface2: #acb0be; -$surface1: #bcc0cc; -$surface0: #ccd0da; -$crust: #dce0e8; -$mantle: #e6e9ef; -$base: #eff1f5; +@use "catppuccin"; + +$flavour: map-get(catppuccin.$palette, "latte"); + +$rosewater: map-get($flavour, "rosewater"); +$flamingo: map-get($flavour, "flamingo"); +$pink: map-get($flavour, "pink"); +$mauve: map-get($flavour, "mauve"); +$red: map-get($flavour, "red"); +$maroon: map-get($flavour, "maroon"); +$peach: map-get($flavour, "peach"); +$yellow: map-get($flavour, "yellow"); +$green: map-get($flavour, "green"); +$teal: map-get($flavour, "teal"); +$sky: map-get($flavour, "sky"); +$sapphire: map-get($flavour, "sapphire"); +$blue: map-get($flavour, "blue"); +$lavender: map-get($flavour, "lavender"); +$text: map-get($flavour, "text"); +$subtext1: map-get($flavour, "subtext1"); +$subtext0: map-get($flavour, "subtext0"); +$overlay2: map-get($flavour, "overlay2"); +$overlay1: map-get($flavour, "overlay1"); +$overlay0: map-get($flavour, "overlay0"); +$surface2: map-get($flavour, "surface2"); +$surface1: map-get($flavour, "surface1"); +$surface0: map-get($flavour, "surface0"); +$base: map-get($flavour, "base"); +$mantle: map-get($flavour, "mantle"); +$crust: map-get($flavour, "crust"); diff --git a/scss/_macchiato.scss b/scss/_macchiato.scss index 9355e38..6a28bb6 100644 --- a/scss/_macchiato.scss +++ b/scss/_macchiato.scss @@ -1,26 +1,30 @@ -$rosewater: #f4dbd6; -$flamingo: #f0c6c6; -$pink: #f5bde6; -$mauve: #c6a0f6; -$red: #ed8796; -$maroon: #ee99a0; -$peach: #f5a97f; -$yellow: #eed49f; -$green: #a6da95; -$teal: #8bd5ca; -$sky: #91d7e3; -$sapphire: #7dc4e4; -$blue: #8aadf4; -$lavender: #b7bdf8; -$text: #cad3f5; -$subtext1: #b8c0e0; -$subtext0: #a5adcb; -$overlay2: #939ab7; -$overlay1: #8087a2; -$overlay0: #6e738d; -$surface2: #5b6078; -$surface1: #494d64; -$surface0: #363a4f; -$base: #24273a; -$mantle: #1e2030; -$crust: #181926; +@use "catppuccin"; + +$flavour: map-get(catppuccin.$palette, "macchiato"); + +$rosewater: map-get($flavour, "rosewater"); +$flamingo: map-get($flavour, "flamingo"); +$pink: map-get($flavour, "pink"); +$mauve: map-get($flavour, "mauve"); +$red: map-get($flavour, "red"); +$maroon: map-get($flavour, "maroon"); +$peach: map-get($flavour, "peach"); +$yellow: map-get($flavour, "yellow"); +$green: map-get($flavour, "green"); +$teal: map-get($flavour, "teal"); +$sky: map-get($flavour, "sky"); +$sapphire: map-get($flavour, "sapphire"); +$blue: map-get($flavour, "blue"); +$lavender: map-get($flavour, "lavender"); +$text: map-get($flavour, "text"); +$subtext1: map-get($flavour, "subtext1"); +$subtext0: map-get($flavour, "subtext0"); +$overlay2: map-get($flavour, "overlay2"); +$overlay1: map-get($flavour, "overlay1"); +$overlay0: map-get($flavour, "overlay0"); +$surface2: map-get($flavour, "surface2"); +$surface1: map-get($flavour, "surface1"); +$surface0: map-get($flavour, "surface0"); +$base: map-get($flavour, "base"); +$mantle: map-get($flavour, "mantle"); +$crust: map-get($flavour, "crust"); diff --git a/scss/_mocha.scss b/scss/_mocha.scss index 728949d..cb2276f 100644 --- a/scss/_mocha.scss +++ b/scss/_mocha.scss @@ -1,26 +1,30 @@ -$rosewater: #f5e0dc; -$flamingo: #f2cdcd; -$pink: #f5c2e7; -$mauve: #cba6f7; -$red: #f38ba8; -$maroon: #eba0ac; -$peach: #fab387; -$yellow: #f9e2af; -$green: #a6e3a1; -$teal: #94e2d5; -$sky: #89dceb; -$sapphire: #74c7ec; -$blue: #89b4fa; -$lavender: #b4befe; -$text: #cdd6f4; -$subtext1: #bac2de; -$subtext0: #a6adc8; -$overlay2: #9399b2; -$overlay1: #7f849c; -$overlay0: #6c7086; -$surface2: #585b70; -$surface1: #45475a; -$surface0: #313244; -$base: #1e1e2e; -$mantle: #181825; -$crust: #11111b; +@use "catppuccin"; + +$flavour: map-get(catppuccin.$palette, "mocha"); + +$rosewater: map-get($flavour, "rosewater"); +$flamingo: map-get($flavour, "flamingo"); +$pink: map-get($flavour, "pink"); +$mauve: map-get($flavour, "mauve"); +$red: map-get($flavour, "red"); +$maroon: map-get($flavour, "maroon"); +$peach: map-get($flavour, "peach"); +$yellow: map-get($flavour, "yellow"); +$green: map-get($flavour, "green"); +$teal: map-get($flavour, "teal"); +$sky: map-get($flavour, "sky"); +$sapphire: map-get($flavour, "sapphire"); +$blue: map-get($flavour, "blue"); +$lavender: map-get($flavour, "lavender"); +$text: map-get($flavour, "text"); +$subtext1: map-get($flavour, "subtext1"); +$subtext0: map-get($flavour, "subtext0"); +$overlay2: map-get($flavour, "overlay2"); +$overlay1: map-get($flavour, "overlay1"); +$overlay0: map-get($flavour, "overlay0"); +$surface2: map-get($flavour, "surface2"); +$surface1: map-get($flavour, "surface1"); +$surface0: map-get($flavour, "surface0"); +$base: map-get($flavour, "base"); +$mantle: map-get($flavour, "mantle"); +$crust: map-get($flavour, "crust");