From 2ea67934644349bb1bd13cf87b6c5aaac21725a6 Mon Sep 17 00:00:00 2001 From: ozrendev Date: Tue, 26 Aug 2025 10:10:03 +0200 Subject: [PATCH 1/6] feat: add catppuccin latte theme --- _icons/iconCatppuccinLatteDarkSmall.svg | 38 ++++ _icons/iconCatppuccinLatteLightSmall.svg | 38 ++++ _icons/textCatppuccinLatteDarkSmall.svg | 38 ++++ _icons/textCatppuccinLatteLightSmall.svg | 38 ++++ src/renderer/components/ThemeSettings.vue | 2 + src/renderer/composables/colors.js | 14 ++ src/renderer/helpers/colors.js | 14 ++ src/renderer/themes.css | 259 +++++++++++++++++++++- static/locales/en-US.yaml | 15 ++ 9 files changed, 454 insertions(+), 2 deletions(-) create mode 100644 _icons/iconCatppuccinLatteDarkSmall.svg create mode 100644 _icons/iconCatppuccinLatteLightSmall.svg create mode 100644 _icons/textCatppuccinLatteDarkSmall.svg create mode 100644 _icons/textCatppuccinLatteLightSmall.svg diff --git a/_icons/iconCatppuccinLatteDarkSmall.svg b/_icons/iconCatppuccinLatteDarkSmall.svg new file mode 100644 index 0000000000000..98c705b5b81dc --- /dev/null +++ b/_icons/iconCatppuccinLatteDarkSmall.svg @@ -0,0 +1,38 @@ + + + + + + diff --git a/_icons/iconCatppuccinLatteLightSmall.svg b/_icons/iconCatppuccinLatteLightSmall.svg new file mode 100644 index 0000000000000..2629e53fea5f3 --- /dev/null +++ b/_icons/iconCatppuccinLatteLightSmall.svg @@ -0,0 +1,38 @@ + + + + + + diff --git a/_icons/textCatppuccinLatteDarkSmall.svg b/_icons/textCatppuccinLatteDarkSmall.svg new file mode 100644 index 0000000000000..3b72d27c9f4ad --- /dev/null +++ b/_icons/textCatppuccinLatteDarkSmall.svg @@ -0,0 +1,38 @@ + + + + + + diff --git a/_icons/textCatppuccinLatteLightSmall.svg b/_icons/textCatppuccinLatteLightSmall.svg new file mode 100644 index 0000000000000..1023216770eb2 --- /dev/null +++ b/_icons/textCatppuccinLatteLightSmall.svg @@ -0,0 +1,38 @@ + + + + + + diff --git a/src/renderer/components/ThemeSettings.vue b/src/renderer/components/ThemeSettings.vue index 6857b27eed3bc..00dc9e10bceaa 100644 --- a/src/renderer/components/ThemeSettings.vue +++ b/src/renderer/components/ThemeSettings.vue @@ -127,6 +127,7 @@ const BASE_THEME_VALUES = [ 'hotPink', 'pastelPink', // Third group + 'catppuccinLatte', 'catppuccinFrappe', 'catppuccinMocha', 'dracula', @@ -153,6 +154,7 @@ const baseThemeNames = computed(() => [ t('Settings.Theme Settings.Base Theme.Hot Pink'), t('Settings.Theme Settings.Base Theme.Pastel Pink'), // Third group + t('Settings.Theme Settings.Base Theme.Catppuccin Latte'), t('Settings.Theme Settings.Base Theme.Catppuccin Frappe'), t('Settings.Theme Settings.Base Theme.Catppuccin Mocha'), t('Settings.Theme Settings.Base Theme.Dracula'), diff --git a/src/renderer/composables/colors.js b/src/renderer/composables/colors.js index 32e71a6156653..66630a083893e 100644 --- a/src/renderer/composables/colors.js +++ b/src/renderer/composables/colors.js @@ -21,6 +21,20 @@ export function useColorTranslations() { t('Settings.Theme Settings.Main Color Theme.Amber'), t('Settings.Theme Settings.Main Color Theme.Orange'), t('Settings.Theme Settings.Main Color Theme.Deep Orange'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Rosewater'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Flamingo'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Pink'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Mauve'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Red'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Maroon'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Peach'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Yellow'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Green'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Teal'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Sky'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Sapphire'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Blue'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Lavender'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Frappe Rosewater'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Frappe Flamingo'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Frappe Pink'), diff --git a/src/renderer/helpers/colors.js b/src/renderer/helpers/colors.js index 1e98eb5140eee..e00f1b97755d6 100644 --- a/src/renderer/helpers/colors.js +++ b/src/renderer/helpers/colors.js @@ -19,6 +19,20 @@ export const colors = [ { name: 'Amber', value: '#FFAB00' }, { name: 'Orange', value: '#FF6D00' }, { name: 'DeepOrange', value: '#DD2C00' }, + { name: 'CatppuccinLatteRosewater', value: '#dc8a78' }, + { name: 'CatppuccinLatteFlamingo', value: '#dd7878' }, + { name: 'CatppuccinLattePink', value: '#ea76cb' }, + { name: 'CatppuccinLatteMauve', value: '#8839ef' }, + { name: 'CatppuccinLatteRed', value: '#d20f39' }, + { name: 'CatppuccinLatteMaroon', value: '#e64553' }, + { name: 'CatppuccinLattePeach', value: '#fe640b' }, + { name: 'CatppuccinLatteYellow', value: '#df8e1d' }, + { name: 'CatppuccinLatteGreen', value: '#40a02b' }, + { name: 'CatppuccinLatteTeal', value: '#179299' }, + { name: 'CatppuccinLatteSky', value: '#04a5e5' }, + { name: 'CatppuccinLatteSapphire', value: '#209fb5' }, + { name: 'CatppuccinLatteBlue', value: '#1e66f5' }, + { name: 'CatppuccinLatteLavender', value: '#7287fd' }, { name: 'CatppuccinFrappeRosewater', value: '#f2d5cf' }, { name: 'CatppuccinFrappeFlamingo', value: '#eebebe' }, { name: 'CatppuccinFrappePink', value: '#f4b8e4' }, diff --git a/src/renderer/themes.css b/src/renderer/themes.css index f67d5bb3ced25..94ed0e5cf3205 100644 --- a/src/renderer/themes.css +++ b/src/renderer/themes.css @@ -133,7 +133,8 @@ it can be safely elided. This looks quite pleasant on this theme. */ .everforestLightMedium, .everforestLightLow, .gruvboxLight, -.solarizedLight { +.solarizedLight, +.catppuccinLatte { --primary-shadow-color: rgb(255 255 255 / 75%); } @@ -538,6 +539,25 @@ it can be safely elided. This looks quite pleasant on this theme. */ --logo-text: url('../../_icons/textEverforestDarkLowSmall.svg'); } +.catppuccinLatte { + --primary-text-color: #4c4f69; + --secondary-text-color: #4c4f69; + --tertiary-text-color: #6c6f85; + --title-color: #4c4f69; + --bg-color: #eff1f5; + --favorite-icon-color: #0f0; + --card-bg-color: #e6e9ef; + --secondary-card-bg-color: #eff1f5; + --scrollbar-color: #ccd0da; + --scrollbar-color-hover: #eff1f5; + --side-nav-color: #e6e9ef; + --side-nav-hover-color: #dce0e8; + --side-nav-active-color: #dce0e8; + --search-bar-color: #ccd0da; + --logo-icon: url('../../_icons/iconCatppuccinLatteDarkSmall.svg'); + --logo-text: url('../../_icons/textCatppuccinLatteDarkSmall.svg'); +} + /*************** PRIMARY THEME COLOR DEFINTIONS ***************/ .mainRed, @@ -980,7 +1000,6 @@ it can be safely elided. This looks quite pleasant on this theme. */ --logo-text-bar-color: url('../../_icons/textGruvboxDarkSmall.svg'); } - .mainCatppuccinFrappeRosewater, .mainCatppuccinFrappeFlamingo, .mainCatppuccinFrappePink, @@ -1187,6 +1206,109 @@ it can be safely elided. This looks quite pleasant on this theme. */ --primary-color-active: #a63f9a; } +.mainCatppuccinLatteRosewater, +.mainCatppuccinLatteFlamingo, +.mainCatppuccinLattePink, +.mainCatppuccinLatteMauve, +.mainCatppuccinLatteRed, +.mainCatppuccinLatteMaroon, +.mainCatppuccinLattePeach, +.mainCatppuccinLatteYellow, +.mainCatppuccinLatteGreen, +.mainCatppuccinLatteTeal, +.mainCatppuccinLatteSky, +.mainCatppuccinLatteSapphire, +.mainCatppuccinLatteBlue, +.mainCatppuccinLatteLavender { + --text-with-main-color: #fff; + --logo-icon-bar-color: url('../../_icons/iconCatppuccinLatteLightSmall.svg'); + --logo-text-bar-color: url('../../_icons/textCatppuccinLatteLightSmall.svg'); +} + +.mainCatppuccinLatteRosewater { + --primary-color: #dc8a78; + --primary-color-hover: #e3a091; + --primary-color-active: #c9715c; +} + +.mainCatppuccinLatteFlamingo { + --primary-color: #dd7878; + --primary-color-hover: #e49292; + --primary-color-active: #d05b5b; +} + +.mainCatppuccinLattePink { + --primary-color: #ea76cb; + --primary-color-hover: #ef93d8; + --primary-color-active: #e054bb; +} + +.mainCatppuccinLatteMauve { + --primary-color: #8839ef; + --primary-color-hover: #9f5cf1; + --primary-color-active: #6c28ce; +} + +.mainCatppuccinLatteRed { + --primary-color: #d20f39; + --primary-color-hover: #dd385c; + --primary-color-active: #a60c2d; +} + +.mainCatppuccinLatteMaroon { + --primary-color: #e64553; + --primary-color-hover: #ed6672; + --primary-color-active: #d82131; +} + +.mainCatppuccinLattePeach { + --primary-color: #fe640b; + --primary-color-hover: #fe7e33; + --primary-color-active: #d35000; +} + +.mainCatppuccinLatteYellow { + --primary-color: #df8e1d; + --primary-color-hover: #e8a33f; + --primary-color-active: #b36f10; +} + +.mainCatppuccinLatteGreen { + --primary-color: #40a02b; + --primary-color-hover: #51b33c; + --primary-color-active: #2d721e; +} + +.mainCatppuccinLatteTeal { + --primary-color: #179299; + --primary-color-hover: #1fb0b8; + --primary-color-active: #0f6469; +} + +.mainCatppuccinLatteSky { + --primary-color: #04a5e5; + --primary-color-hover: #29b5eb; + --primary-color-active: #0381b4; +} + +.mainCatppuccinLatteSapphire { + --primary-color: #209fb5; + --primary-color-hover: #36b3c9; + --primary-color-active: #177888; +} + +.mainCatppuccinLatteBlue { + --primary-color: #1e66f5; + --primary-color-hover: #4180f7; + --primary-color-active: #164ec3; +} + +.mainCatppuccinLatteLavender { + --primary-color: #7287fd; + --primary-color-hover: #90a1fd; + --primary-color-active: #4f68fc; +} + /*************** SECONDARY THEME COLOR DEFINTIONS ***************/ /* dark secondary theme colors */ @@ -2000,6 +2122,139 @@ it can be safely elided. This looks quite pleasant on this theme. */ --accent-color-visited: #c84f9a; } +.secCatppuccinLatteRosewater, +.secCatppuccinLatteFlamingo { + --text-with-accent-color: #4c4f69; +} + +.secCatppuccinLattePink, +.secCatppuccinLatteMauve, +.secCatppuccinLatteRed, +.secCatppuccinLatteMaroon, +.secCatppuccinLattePeach, +.secCatppuccinLatteYellow, +.secCatppuccinLatteGreen, +.secCatppuccinLatteTeal, +.secCatppuccinLatteSky, +.secCatppuccinLatteSapphire, +.secCatppuccinLatteBlue, +.secCatppuccinLatteLavender { + --text-with-accent-color: #fff; +} + +.secCatppuccinLatteRosewater { + --accent-color-rgb: 245 224 220; + --accent-color-hover: #fbf6f5; + --accent-color-active: #e6c9c2; + --accent-color-light: #f7f3ea; + --accent-color-visited: #d9b9b3; +} + +.secCatppuccinLatteFlamingo { + --accent-color-rgb: 242 205 205; + --accent-color-hover: #f8e9e9; + --accent-color-active: #e8b6b6; + --accent-color-light: #f4dede; + --accent-color-visited: #d4a3a3; +} + +.secCatppuccinLattePink { + --accent-color-rgb: 234 118 203; + --accent-color-hover: #ef93d8; + --accent-color-active: #e258bc; + --accent-color-light: #f4aee3; + --accent-color-visited: #c94ba0; +} + +.secCatppuccinLatteMauve { + --accent-color-rgb: 136 57 239; + --accent-color-hover: #9f5cf1; + --accent-color-active: #7129d2; + --accent-color-light: #b076f8; + --accent-color-visited: #6021a9; +} + +.secCatppuccinLatteRed { + --accent-color-rgb: 210 15 57; + --accent-color-hover: #dd385c; + --accent-color-active: #ad0c2e; + --accent-color-light: #e64e71; + --accent-color-visited: #810922; +} + +.secCatppuccinLatteMaroon { + --accent-color-rgb: 230 69 83; + --accent-color-hover: #ed6672; + --accent-color-active: #d82131; + --accent-color-light: #f2838d; + --accent-color-visited: #b82e3a; +} + +.secCatppuccinLattePeach { + --accent-color-rgb: 254 100 11; + --accent-color-hover: #fe7e33; + --accent-color-active: #d35000; + --accent-color-light: #fe9354; + --accent-color-visited: #a1420f; +} + +.secCatppuccinLatteYellow { + --accent-color-rgb: 223 142 29; + --accent-color-hover: #e8a33f; + --accent-color-active: #b87211; + --accent-color-light: #eeb05b; + --accent-color-visited: #8a5615; +} + +.secCatppuccinLatteGreen { + --accent-color-rgb: 64 160 43; + --accent-color-hover: #51b33c; + --accent-color-active: #307a20; + --accent-color-light: #63c450; + --accent-color-visited: #3a6e32; +} + +.secCatppuccinLatteTeal { + --accent-color-rgb: 23 146 153; + --accent-color-hover: #1fb0b8; + --accent-color-active: #106b70; + --accent-color-light: #29c5cd; + --accent-color-visited: #134d50; +} + +.secCatppuccinLatteSky { + --accent-color-rgb: 4 165 229; + --accent-color-hover: #29b5eb; + --accent-color-active: #0384b8; + --accent-color-light: #48c2ee; + --accent-color-visited: #0e6ea0; +} + +.secCatppuccinLatteSapphire { + --accent-color-rgb: 32 159 181; + --accent-color-hover: #36b3c9; + --accent-color-active: #187f91; + --accent-color-light: #50c3d5; + --accent-color-visited: #206a77; +} + +.secCatppuccinLatteBlue { + --accent-color-rgb: 30 102 245; + --accent-color-hover: #4180f7; + --accent-color-active: #164ec3; + --accent-color-light: #6295fc; + --accent-color-visited: #1b44a9; +} + +.secCatppuccinLatteLavender { + --accent-color-rgb: 114 135 253; + --accent-color-hover: #90a1fd; + --accent-color-active: #4f68fc; + --accent-color-light: #aeb9fe; + --accent-color-visited: #5064e1; +} + + /*************** DESTRUCTIVE THEME COLOR OVERRIDES ***************/ /* stylelint-disable no-descending-specificity */ diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml index 17b15a12a76de..d87561b891763 100644 --- a/static/locales/en-US.yaml +++ b/static/locales/en-US.yaml @@ -334,6 +334,7 @@ Settings: System Default: System Default Light: Light Dracula: Dracula + Catppuccin Latte: Catppuccin Latte Catppuccin Frappe: Catppuccin Frappe Catppuccin Mocha: Catppuccin Mocha Pastel Pink: Pastel Pink @@ -402,6 +403,20 @@ Settings: Catppuccin Mocha Sapphire: Catppuccin Mocha Sapphire Catppuccin Mocha Blue: Catppuccin Mocha Blue Catppuccin Mocha Lavender: Catppuccin Mocha Lavender + Catppuccin Latte Rosewater: Catppuccin Latte Rosewater + Catppuccin Latte Flamingo: Catppuccin Latte Flamingo + Catppuccin Latte Pink: Catppuccin Latte Pink + Catppuccin Latte Mauve: Catppuccin Latte Mauve + Catppuccin Latte Red: Catppuccin Latte Red + Catppuccin Latte Maroon: Catppuccin Latte Maroon + Catppuccin Latte Peach: Catppuccin Latte Peach + Catppuccin Latte Yellow: Catppuccin Latte Yellow + Catppuccin Latte Green: Catppuccin Latte Green + Catppuccin Latte Teal: Catppuccin Latte Teal + Catppuccin Latte Sky: Catppuccin Latte Sky + Catppuccin Latte Sapphire: Catppuccin Latte Sapphire + Catppuccin Latte Blue: Catppuccin Latte Blue + Catppuccin Latte Lavender: Catppuccin Latte Lavender Gruvbox Dark Green: Gruvbox Dark Green Gruvbox Dark Yellow: Gruvbox Dark Yellow Gruvbox Dark Blue: Gruvbox Dark Blue From 89d83fcf08d20d06b0e4e4de68db774487fcaadf Mon Sep 17 00:00:00 2001 From: ozrendev Date: Tue, 26 Aug 2025 10:14:03 +0200 Subject: [PATCH 2/6] add case to index.js --- src/main/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/index.js b/src/main/index.js index e6549a702ddcf..a27b3fab9e666 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -879,6 +879,8 @@ function runApp() { return '#fdf6e3' case 'everforest-light-low': return '#f3ead3' + case 'catppuccin-latte': + return '#eff1f5' case 'system': default: return nativeTheme.shouldUseDarkColors ? '#212121' : '#f1f1f1' From 894a5fe425c7cc2c3570b1cba75364edad80c4de Mon Sep 17 00:00:00 2001 From: ozrendev Date: Thu, 28 Aug 2025 08:14:59 +0200 Subject: [PATCH 3/6] remove metadata from svg --- _icons/iconCatppuccinLatteDarkSmall.svg | 39 +----------------------- _icons/iconCatppuccinLatteLightSmall.svg | 39 +----------------------- _icons/textCatppuccinLatteDarkSmall.svg | 39 +----------------------- _icons/textCatppuccinLatteLightSmall.svg | 39 +----------------------- 4 files changed, 4 insertions(+), 152 deletions(-) diff --git a/_icons/iconCatppuccinLatteDarkSmall.svg b/_icons/iconCatppuccinLatteDarkSmall.svg index 98c705b5b81dc..77515ac5c2834 100644 --- a/_icons/iconCatppuccinLatteDarkSmall.svg +++ b/_icons/iconCatppuccinLatteDarkSmall.svg @@ -1,38 +1 @@ - - - - - - + diff --git a/_icons/iconCatppuccinLatteLightSmall.svg b/_icons/iconCatppuccinLatteLightSmall.svg index 2629e53fea5f3..b4f00c9e6a7ce 100644 --- a/_icons/iconCatppuccinLatteLightSmall.svg +++ b/_icons/iconCatppuccinLatteLightSmall.svg @@ -1,38 +1 @@ - - - - - - + diff --git a/_icons/textCatppuccinLatteDarkSmall.svg b/_icons/textCatppuccinLatteDarkSmall.svg index 3b72d27c9f4ad..fab65c971dc98 100644 --- a/_icons/textCatppuccinLatteDarkSmall.svg +++ b/_icons/textCatppuccinLatteDarkSmall.svg @@ -1,38 +1 @@ - - - - - - + diff --git a/_icons/textCatppuccinLatteLightSmall.svg b/_icons/textCatppuccinLatteLightSmall.svg index 1023216770eb2..a7e98bfd03eed 100644 --- a/_icons/textCatppuccinLatteLightSmall.svg +++ b/_icons/textCatppuccinLatteLightSmall.svg @@ -1,38 +1 @@ - - - - - - + From db524e4a289f774b50d02326a6687ee5f2cc522c Mon Sep 17 00:00:00 2001 From: ozrendev Date: Thu, 28 Aug 2025 08:23:50 +0200 Subject: [PATCH 4/6] fix alphabet order --- src/renderer/components/ThemeSettings.vue | 4 +-- src/renderer/composables/colors.js | 28 ++++++++++----------- src/renderer/helpers/colors.js | 28 ++++++++++----------- static/locales/en-US.yaml | 30 +++++++++++------------ 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/renderer/components/ThemeSettings.vue b/src/renderer/components/ThemeSettings.vue index 00dc9e10bceaa..7d8a05d2cde55 100644 --- a/src/renderer/components/ThemeSettings.vue +++ b/src/renderer/components/ThemeSettings.vue @@ -127,8 +127,8 @@ const BASE_THEME_VALUES = [ 'hotPink', 'pastelPink', // Third group - 'catppuccinLatte', 'catppuccinFrappe', + 'catppuccinLatte', 'catppuccinMocha', 'dracula', 'everforestDarkHard', @@ -154,8 +154,8 @@ const baseThemeNames = computed(() => [ t('Settings.Theme Settings.Base Theme.Hot Pink'), t('Settings.Theme Settings.Base Theme.Pastel Pink'), // Third group - t('Settings.Theme Settings.Base Theme.Catppuccin Latte'), t('Settings.Theme Settings.Base Theme.Catppuccin Frappe'), + t('Settings.Theme Settings.Base Theme.Catppuccin Latte'), t('Settings.Theme Settings.Base Theme.Catppuccin Mocha'), t('Settings.Theme Settings.Base Theme.Dracula'), t('Settings.Theme Settings.Base Theme.Everforest Dark Hard'), diff --git a/src/renderer/composables/colors.js b/src/renderer/composables/colors.js index 66630a083893e..6b4773c9dea2c 100644 --- a/src/renderer/composables/colors.js +++ b/src/renderer/composables/colors.js @@ -21,20 +21,6 @@ export function useColorTranslations() { t('Settings.Theme Settings.Main Color Theme.Amber'), t('Settings.Theme Settings.Main Color Theme.Orange'), t('Settings.Theme Settings.Main Color Theme.Deep Orange'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Rosewater'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Flamingo'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Pink'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Mauve'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Red'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Maroon'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Peach'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Yellow'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Green'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Teal'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Sky'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Sapphire'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Blue'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Lavender'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Frappe Rosewater'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Frappe Flamingo'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Frappe Pink'), @@ -49,6 +35,20 @@ export function useColorTranslations() { t('Settings.Theme Settings.Main Color Theme.Catppuccin Frappe Sapphire'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Frappe Blue'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Frappe Lavender'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Rosewater'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Flamingo'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Pink'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Mauve'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Red'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Maroon'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Peach'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Yellow'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Green'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Teal'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Sky'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Sapphire'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Blue'), + t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Lavender'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Rosewater'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Flamingo'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Pink'), diff --git a/src/renderer/helpers/colors.js b/src/renderer/helpers/colors.js index e00f1b97755d6..a58d2975373fa 100644 --- a/src/renderer/helpers/colors.js +++ b/src/renderer/helpers/colors.js @@ -19,20 +19,6 @@ export const colors = [ { name: 'Amber', value: '#FFAB00' }, { name: 'Orange', value: '#FF6D00' }, { name: 'DeepOrange', value: '#DD2C00' }, - { name: 'CatppuccinLatteRosewater', value: '#dc8a78' }, - { name: 'CatppuccinLatteFlamingo', value: '#dd7878' }, - { name: 'CatppuccinLattePink', value: '#ea76cb' }, - { name: 'CatppuccinLatteMauve', value: '#8839ef' }, - { name: 'CatppuccinLatteRed', value: '#d20f39' }, - { name: 'CatppuccinLatteMaroon', value: '#e64553' }, - { name: 'CatppuccinLattePeach', value: '#fe640b' }, - { name: 'CatppuccinLatteYellow', value: '#df8e1d' }, - { name: 'CatppuccinLatteGreen', value: '#40a02b' }, - { name: 'CatppuccinLatteTeal', value: '#179299' }, - { name: 'CatppuccinLatteSky', value: '#04a5e5' }, - { name: 'CatppuccinLatteSapphire', value: '#209fb5' }, - { name: 'CatppuccinLatteBlue', value: '#1e66f5' }, - { name: 'CatppuccinLatteLavender', value: '#7287fd' }, { name: 'CatppuccinFrappeRosewater', value: '#f2d5cf' }, { name: 'CatppuccinFrappeFlamingo', value: '#eebebe' }, { name: 'CatppuccinFrappePink', value: '#f4b8e4' }, @@ -47,6 +33,20 @@ export const colors = [ { name: 'CatppuccinFrappeSapphire', value: '#85c1dc' }, { name: 'CatppuccinFrappeBlue', value: '#8caaee' }, { name: 'CatppuccinFrappeLavender', value: '#babbf1' }, + { name: 'CatppuccinLatteRosewater', value: '#dc8a78' }, + { name: 'CatppuccinLatteFlamingo', value: '#dd7878' }, + { name: 'CatppuccinLattePink', value: '#ea76cb' }, + { name: 'CatppuccinLatteMauve', value: '#8839ef' }, + { name: 'CatppuccinLatteRed', value: '#d20f39' }, + { name: 'CatppuccinLatteMaroon', value: '#e64553' }, + { name: 'CatppuccinLattePeach', value: '#fe640b' }, + { name: 'CatppuccinLatteYellow', value: '#df8e1d' }, + { name: 'CatppuccinLatteGreen', value: '#40a02b' }, + { name: 'CatppuccinLatteTeal', value: '#179299' }, + { name: 'CatppuccinLatteSky', value: '#04a5e5' }, + { name: 'CatppuccinLatteSapphire', value: '#209fb5' }, + { name: 'CatppuccinLatteBlue', value: '#1e66f5' }, + { name: 'CatppuccinLatteLavender', value: '#7287fd' }, { name: 'CatppuccinMochaRosewater', value: '#F5E0DC' }, { name: 'CatppuccinMochaFlamingo', value: '#F2CDCD' }, { name: 'CatppuccinMochaPink', value: '#F5C2E7' }, diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml index d87561b891763..c5182fac316c7 100644 --- a/static/locales/en-US.yaml +++ b/static/locales/en-US.yaml @@ -334,8 +334,8 @@ Settings: System Default: System Default Light: Light Dracula: Dracula - Catppuccin Latte: Catppuccin Latte Catppuccin Frappe: Catppuccin Frappe + Catppuccin Latte: Catppuccin Latte Catppuccin Mocha: Catppuccin Mocha Pastel Pink: Pastel Pink Hot Pink: Hot Pink @@ -389,20 +389,6 @@ Settings: Catppuccin Frappe Sapphire: Catppuccin Frappe Sapphire Catppuccin Frappe Blue: Catppuccin Frappe Blue Catppuccin Frappe Lavender: Catppuccin Frappe Lavender - Catppuccin Mocha Rosewater: Catppuccin Mocha Rosewater - Catppuccin Mocha Flamingo: Catppuccin Mocha Flamingo - Catppuccin Mocha Pink: Catppuccin Mocha Pink - Catppuccin Mocha Mauve: Catppuccin Mocha Mauve - Catppuccin Mocha Red: Catppuccin Mocha Red - Catppuccin Mocha Maroon: Catppuccin Mocha Maroon - Catppuccin Mocha Peach: Catppuccin Mocha Peach - Catppuccin Mocha Yellow: Catppuccin Mocha Yellow - Catppuccin Mocha Green: Catppuccin Mocha Green - Catppuccin Mocha Teal: Catppuccin Mocha Teal - Catppuccin Mocha Sky: Catppuccin Mocha Sky - Catppuccin Mocha Sapphire: Catppuccin Mocha Sapphire - Catppuccin Mocha Blue: Catppuccin Mocha Blue - Catppuccin Mocha Lavender: Catppuccin Mocha Lavender Catppuccin Latte Rosewater: Catppuccin Latte Rosewater Catppuccin Latte Flamingo: Catppuccin Latte Flamingo Catppuccin Latte Pink: Catppuccin Latte Pink @@ -417,6 +403,20 @@ Settings: Catppuccin Latte Sapphire: Catppuccin Latte Sapphire Catppuccin Latte Blue: Catppuccin Latte Blue Catppuccin Latte Lavender: Catppuccin Latte Lavender + Catppuccin Mocha Rosewater: Catppuccin Mocha Rosewater + Catppuccin Mocha Flamingo: Catppuccin Mocha Flamingo + Catppuccin Mocha Pink: Catppuccin Mocha Pink + Catppuccin Mocha Mauve: Catppuccin Mocha Mauve + Catppuccin Mocha Red: Catppuccin Mocha Red + Catppuccin Mocha Maroon: Catppuccin Mocha Maroon + Catppuccin Mocha Peach: Catppuccin Mocha Peach + Catppuccin Mocha Yellow: Catppuccin Mocha Yellow + Catppuccin Mocha Green: Catppuccin Mocha Green + Catppuccin Mocha Teal: Catppuccin Mocha Teal + Catppuccin Mocha Sky: Catppuccin Mocha Sky + Catppuccin Mocha Sapphire: Catppuccin Mocha Sapphire + Catppuccin Mocha Blue: Catppuccin Mocha Blue + Catppuccin Mocha Lavender: Catppuccin Mocha Lavender Gruvbox Dark Green: Gruvbox Dark Green Gruvbox Dark Yellow: Gruvbox Dark Yellow Gruvbox Dark Blue: Gruvbox Dark Blue From ffbdc1e855afeeaba345ba5d5705a89a9e3eb6da Mon Sep 17 00:00:00 2001 From: ozrendev Date: Mon, 6 Oct 2025 11:28:22 +0200 Subject: [PATCH 5/6] remove colors that don't conform to WCAG 4.5:1 --- src/renderer/composables/colors.js | 12 -- src/renderer/helpers/colors.js | 12 -- src/renderer/themes.css | 195 +---------------------------- static/locales/en-US.yaml | 12 -- 4 files changed, 2 insertions(+), 229 deletions(-) diff --git a/src/renderer/composables/colors.js b/src/renderer/composables/colors.js index 6b4773c9dea2c..9e342851c16e4 100644 --- a/src/renderer/composables/colors.js +++ b/src/renderer/composables/colors.js @@ -35,20 +35,8 @@ export function useColorTranslations() { t('Settings.Theme Settings.Main Color Theme.Catppuccin Frappe Sapphire'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Frappe Blue'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Frappe Lavender'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Rosewater'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Flamingo'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Pink'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Mauve'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Red'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Maroon'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Peach'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Yellow'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Green'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Teal'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Sky'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Sapphire'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Blue'), - t('Settings.Theme Settings.Main Color Theme.Catppuccin Latte Lavender'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Rosewater'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Flamingo'), t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Pink'), diff --git a/src/renderer/helpers/colors.js b/src/renderer/helpers/colors.js index a58d2975373fa..22aa80a529ded 100644 --- a/src/renderer/helpers/colors.js +++ b/src/renderer/helpers/colors.js @@ -33,20 +33,8 @@ export const colors = [ { name: 'CatppuccinFrappeSapphire', value: '#85c1dc' }, { name: 'CatppuccinFrappeBlue', value: '#8caaee' }, { name: 'CatppuccinFrappeLavender', value: '#babbf1' }, - { name: 'CatppuccinLatteRosewater', value: '#dc8a78' }, - { name: 'CatppuccinLatteFlamingo', value: '#dd7878' }, - { name: 'CatppuccinLattePink', value: '#ea76cb' }, { name: 'CatppuccinLatteMauve', value: '#8839ef' }, { name: 'CatppuccinLatteRed', value: '#d20f39' }, - { name: 'CatppuccinLatteMaroon', value: '#e64553' }, - { name: 'CatppuccinLattePeach', value: '#fe640b' }, - { name: 'CatppuccinLatteYellow', value: '#df8e1d' }, - { name: 'CatppuccinLatteGreen', value: '#40a02b' }, - { name: 'CatppuccinLatteTeal', value: '#179299' }, - { name: 'CatppuccinLatteSky', value: '#04a5e5' }, - { name: 'CatppuccinLatteSapphire', value: '#209fb5' }, - { name: 'CatppuccinLatteBlue', value: '#1e66f5' }, - { name: 'CatppuccinLatteLavender', value: '#7287fd' }, { name: 'CatppuccinMochaRosewater', value: '#F5E0DC' }, { name: 'CatppuccinMochaFlamingo', value: '#F2CDCD' }, { name: 'CatppuccinMochaPink', value: '#F5C2E7' }, diff --git a/src/renderer/themes.css b/src/renderer/themes.css index 94ed0e5cf3205..c85e609ffd11c 100644 --- a/src/renderer/themes.css +++ b/src/renderer/themes.css @@ -1206,43 +1206,13 @@ it can be safely elided. This looks quite pleasant on this theme. */ --primary-color-active: #a63f9a; } -.mainCatppuccinLatteRosewater, -.mainCatppuccinLatteFlamingo, -.mainCatppuccinLattePink, .mainCatppuccinLatteMauve, -.mainCatppuccinLatteRed, -.mainCatppuccinLatteMaroon, -.mainCatppuccinLattePeach, -.mainCatppuccinLatteYellow, -.mainCatppuccinLatteGreen, -.mainCatppuccinLatteTeal, -.mainCatppuccinLatteSky, -.mainCatppuccinLatteSapphire, -.mainCatppuccinLatteBlue, -.mainCatppuccinLatteLavender { +.mainCatppuccinLatteRed { --text-with-main-color: #fff; --logo-icon-bar-color: url('../../_icons/iconCatppuccinLatteLightSmall.svg'); --logo-text-bar-color: url('../../_icons/textCatppuccinLatteLightSmall.svg'); } -.mainCatppuccinLatteRosewater { - --primary-color: #dc8a78; - --primary-color-hover: #e3a091; - --primary-color-active: #c9715c; -} - -.mainCatppuccinLatteFlamingo { - --primary-color: #dd7878; - --primary-color-hover: #e49292; - --primary-color-active: #d05b5b; -} - -.mainCatppuccinLattePink { - --primary-color: #ea76cb; - --primary-color-hover: #ef93d8; - --primary-color-active: #e054bb; -} - .mainCatppuccinLatteMauve { --primary-color: #8839ef; --primary-color-hover: #9f5cf1; @@ -1255,60 +1225,6 @@ it can be safely elided. This looks quite pleasant on this theme. */ --primary-color-active: #a60c2d; } -.mainCatppuccinLatteMaroon { - --primary-color: #e64553; - --primary-color-hover: #ed6672; - --primary-color-active: #d82131; -} - -.mainCatppuccinLattePeach { - --primary-color: #fe640b; - --primary-color-hover: #fe7e33; - --primary-color-active: #d35000; -} - -.mainCatppuccinLatteYellow { - --primary-color: #df8e1d; - --primary-color-hover: #e8a33f; - --primary-color-active: #b36f10; -} - -.mainCatppuccinLatteGreen { - --primary-color: #40a02b; - --primary-color-hover: #51b33c; - --primary-color-active: #2d721e; -} - -.mainCatppuccinLatteTeal { - --primary-color: #179299; - --primary-color-hover: #1fb0b8; - --primary-color-active: #0f6469; -} - -.mainCatppuccinLatteSky { - --primary-color: #04a5e5; - --primary-color-hover: #29b5eb; - --primary-color-active: #0381b4; -} - -.mainCatppuccinLatteSapphire { - --primary-color: #209fb5; - --primary-color-hover: #36b3c9; - --primary-color-active: #177888; -} - -.mainCatppuccinLatteBlue { - --primary-color: #1e66f5; - --primary-color-hover: #4180f7; - --primary-color-active: #164ec3; -} - -.mainCatppuccinLatteLavender { - --primary-color: #7287fd; - --primary-color-hover: #90a1fd; - --primary-color-active: #4f68fc; -} - /*************** SECONDARY THEME COLOR DEFINTIONS ***************/ /* dark secondary theme colors */ @@ -2127,45 +2043,11 @@ it can be safely elided. This looks quite pleasant on this theme. */ --text-with-accent-color: #4c4f69; } -.secCatppuccinLattePink, .secCatppuccinLatteMauve, -.secCatppuccinLatteRed, -.secCatppuccinLatteMaroon, -.secCatppuccinLattePeach, -.secCatppuccinLatteYellow, -.secCatppuccinLatteGreen, -.secCatppuccinLatteTeal, -.secCatppuccinLatteSky, -.secCatppuccinLatteSapphire, -.secCatppuccinLatteBlue, -.secCatppuccinLatteLavender { +.secCatppuccinLatteRed { --text-with-accent-color: #fff; } -.secCatppuccinLatteRosewater { - --accent-color-rgb: 245 224 220; - --accent-color-hover: #fbf6f5; - --accent-color-active: #e6c9c2; - --accent-color-light: #f7f3ea; - --accent-color-visited: #d9b9b3; -} - -.secCatppuccinLatteFlamingo { - --accent-color-rgb: 242 205 205; - --accent-color-hover: #f8e9e9; - --accent-color-active: #e8b6b6; - --accent-color-light: #f4dede; - --accent-color-visited: #d4a3a3; -} - -.secCatppuccinLattePink { - --accent-color-rgb: 234 118 203; - --accent-color-hover: #ef93d8; - --accent-color-active: #e258bc; - --accent-color-light: #f4aee3; - --accent-color-visited: #c94ba0; -} - .secCatppuccinLatteMauve { --accent-color-rgb: 136 57 239; --accent-color-hover: #9f5cf1; @@ -2182,79 +2064,6 @@ it can be safely elided. This looks quite pleasant on this theme. */ --accent-color-visited: #810922; } -.secCatppuccinLatteMaroon { - --accent-color-rgb: 230 69 83; - --accent-color-hover: #ed6672; - --accent-color-active: #d82131; - --accent-color-light: #f2838d; - --accent-color-visited: #b82e3a; -} - -.secCatppuccinLattePeach { - --accent-color-rgb: 254 100 11; - --accent-color-hover: #fe7e33; - --accent-color-active: #d35000; - --accent-color-light: #fe9354; - --accent-color-visited: #a1420f; -} - -.secCatppuccinLatteYellow { - --accent-color-rgb: 223 142 29; - --accent-color-hover: #e8a33f; - --accent-color-active: #b87211; - --accent-color-light: #eeb05b; - --accent-color-visited: #8a5615; -} - -.secCatppuccinLatteGreen { - --accent-color-rgb: 64 160 43; - --accent-color-hover: #51b33c; - --accent-color-active: #307a20; - --accent-color-light: #63c450; - --accent-color-visited: #3a6e32; -} - -.secCatppuccinLatteTeal { - --accent-color-rgb: 23 146 153; - --accent-color-hover: #1fb0b8; - --accent-color-active: #106b70; - --accent-color-light: #29c5cd; - --accent-color-visited: #134d50; -} - -.secCatppuccinLatteSky { - --accent-color-rgb: 4 165 229; - --accent-color-hover: #29b5eb; - --accent-color-active: #0384b8; - --accent-color-light: #48c2ee; - --accent-color-visited: #0e6ea0; -} - -.secCatppuccinLatteSapphire { - --accent-color-rgb: 32 159 181; - --accent-color-hover: #36b3c9; - --accent-color-active: #187f91; - --accent-color-light: #50c3d5; - --accent-color-visited: #206a77; -} - -.secCatppuccinLatteBlue { - --accent-color-rgb: 30 102 245; - --accent-color-hover: #4180f7; - --accent-color-active: #164ec3; - --accent-color-light: #6295fc; - --accent-color-visited: #1b44a9; -} - -.secCatppuccinLatteLavender { - --accent-color-rgb: 114 135 253; - --accent-color-hover: #90a1fd; - --accent-color-active: #4f68fc; - --accent-color-light: #aeb9fe; - --accent-color-visited: #5064e1; -} - - /*************** DESTRUCTIVE THEME COLOR OVERRIDES ***************/ /* stylelint-disable no-descending-specificity */ diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml index c5182fac316c7..f2d15ba446492 100644 --- a/static/locales/en-US.yaml +++ b/static/locales/en-US.yaml @@ -389,20 +389,8 @@ Settings: Catppuccin Frappe Sapphire: Catppuccin Frappe Sapphire Catppuccin Frappe Blue: Catppuccin Frappe Blue Catppuccin Frappe Lavender: Catppuccin Frappe Lavender - Catppuccin Latte Rosewater: Catppuccin Latte Rosewater - Catppuccin Latte Flamingo: Catppuccin Latte Flamingo - Catppuccin Latte Pink: Catppuccin Latte Pink Catppuccin Latte Mauve: Catppuccin Latte Mauve Catppuccin Latte Red: Catppuccin Latte Red - Catppuccin Latte Maroon: Catppuccin Latte Maroon - Catppuccin Latte Peach: Catppuccin Latte Peach - Catppuccin Latte Yellow: Catppuccin Latte Yellow - Catppuccin Latte Green: Catppuccin Latte Green - Catppuccin Latte Teal: Catppuccin Latte Teal - Catppuccin Latte Sky: Catppuccin Latte Sky - Catppuccin Latte Sapphire: Catppuccin Latte Sapphire - Catppuccin Latte Blue: Catppuccin Latte Blue - Catppuccin Latte Lavender: Catppuccin Latte Lavender Catppuccin Mocha Rosewater: Catppuccin Mocha Rosewater Catppuccin Mocha Flamingo: Catppuccin Mocha Flamingo Catppuccin Mocha Pink: Catppuccin Mocha Pink From 0953e0dc9916216446e4badac90e8e89a41dd13d Mon Sep 17 00:00:00 2001 From: ozrendev <60355164+ozrendev@users.noreply.github.com> Date: Mon, 6 Oct 2025 18:41:08 +0200 Subject: [PATCH 6/6] Update src/renderer/themes.css Co-authored-by: efb4f5ff-1298-471a-8973-3d47447115dc <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com> --- src/renderer/themes.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/renderer/themes.css b/src/renderer/themes.css index c85e609ffd11c..2cded1e14998b 100644 --- a/src/renderer/themes.css +++ b/src/renderer/themes.css @@ -2038,11 +2038,6 @@ it can be safely elided. This looks quite pleasant on this theme. */ --accent-color-visited: #c84f9a; } -.secCatppuccinLatteRosewater, -.secCatppuccinLatteFlamingo { - --text-with-accent-color: #4c4f69; -} - .secCatppuccinLatteMauve, .secCatppuccinLatteRed { --text-with-accent-color: #fff;