From 8a69b48351c259a75ed944341e8000140f475e0c Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 2 May 2023 15:14:12 -0700 Subject: [PATCH] Revert "chore: theme refactor" This reverts commit 6953fceade5fe8a6e0cb83a10f977c0643663b91. --- packages/client/src/themes/d-astro.json5 | 2 +- packages/client/src/themes/d-botanical.json5 | 2 +- .../src/themes/d-catppuccin-frappe.json5 | 2 +- .../src/themes/d-catppuccin-mocha.json5 | 2 +- packages/client/src/themes/d-cherry.json5 | 2 +- packages/client/src/themes/d-future.json5 | 2 +- packages/client/src/themes/d-green-lime.json5 | 2 +- .../client/src/themes/d-green-orange.json5 | 24 +++++ packages/client/src/themes/d-ice.json5 | 2 +- packages/client/src/themes/d-persimmon.json5 | 2 +- packages/client/src/themes/d-u0.json5 | 2 +- packages/client/src/themes/l-apricot.json5 | 2 +- .../src/themes/l-catppuccin-latte.json5 | 94 ------------------- packages/client/src/themes/l-cherry.json5 | 2 +- packages/client/src/themes/l-coffee.json5 | 2 +- packages/client/src/themes/l-rainy.json5 | 2 +- packages/client/src/themes/l-sushi.json5 | 2 +- packages/client/src/themes/l-u0.json5 | 2 +- packages/client/src/themes/l-vivid.json5 | 2 +- 19 files changed, 41 insertions(+), 111 deletions(-) create mode 100644 packages/client/src/themes/d-green-orange.json5 delete mode 100644 packages/client/src/themes/l-catppuccin-latte.json5 diff --git a/packages/client/src/themes/d-astro.json5 b/packages/client/src/themes/d-astro.json5 index a51ee94ae8..c6a927ec3a 100644 --- a/packages/client/src/themes/d-astro.json5 +++ b/packages/client/src/themes/d-astro.json5 @@ -1,7 +1,7 @@ { id: '080a01c5-377d-4fbb-88cc-6bb5d04977ea', base: 'dark', - name: 'Astro Dark', + name: 'Mi Astro Dark', author: 'syuilo', props: { bg: '#232125', diff --git a/packages/client/src/themes/d-botanical.json5 b/packages/client/src/themes/d-botanical.json5 index 08fabf86a3..c03b95e2d7 100644 --- a/packages/client/src/themes/d-botanical.json5 +++ b/packages/client/src/themes/d-botanical.json5 @@ -1,7 +1,7 @@ { id: '504debaf-4912-6a4c-5059-1db08a76b737', - name: 'Botanical Dark', + name: 'Mi Botanical Dark', author: 'syuilo', base: 'dark', diff --git a/packages/client/src/themes/d-catppuccin-frappe.json5 b/packages/client/src/themes/d-catppuccin-frappe.json5 index ed3aac3c56..891fe18058 100644 --- a/packages/client/src/themes/d-catppuccin-frappe.json5 +++ b/packages/client/src/themes/d-catppuccin-frappe.json5 @@ -1,7 +1,7 @@ { id: 'ffcd3328-5c57-4ca3-9dac-4580cbf7742f', base: 'dark', - name: 'Catppuccin Frappe', + name: 'Catppuccin frappe', props: { X2: ':darken<2<@panel', X3: 'rgba(255, 255, 255, 0.05)', diff --git a/packages/client/src/themes/d-catppuccin-mocha.json5 b/packages/client/src/themes/d-catppuccin-mocha.json5 index 83d464f885..94e1381c71 100644 --- a/packages/client/src/themes/d-catppuccin-mocha.json5 +++ b/packages/client/src/themes/d-catppuccin-mocha.json5 @@ -1,7 +1,7 @@ { id: 'd413f41f-a489-48be-9e20-3532ffbb4363', base: 'dark', - name: 'Catppuccin Mocha', + name: 'Catppuccin mocha', props: { X2: ':darken<2<@panel', X3: 'rgba(255, 255, 255, 0.05)', diff --git a/packages/client/src/themes/d-cherry.json5 b/packages/client/src/themes/d-cherry.json5 index e39e9ce666..a7e1ad1c80 100644 --- a/packages/client/src/themes/d-cherry.json5 +++ b/packages/client/src/themes/d-cherry.json5 @@ -1,7 +1,7 @@ { id: '679b3b87-a4e9-4789-8696-b56c15cc33b0', - name: 'Cherry Dark', + name: 'Mi Cherry Dark', author: 'syuilo', base: 'dark', diff --git a/packages/client/src/themes/d-future.json5 b/packages/client/src/themes/d-future.json5 index 8b63457084..b6fa1ab0c1 100644 --- a/packages/client/src/themes/d-future.json5 +++ b/packages/client/src/themes/d-future.json5 @@ -1,7 +1,7 @@ { id: '32a637ef-b47a-4775-bb7b-bacbb823f865', - name: 'Future Dark', + name: 'Mi Future Dark', author: 'syuilo', base: 'dark', diff --git a/packages/client/src/themes/d-green-lime.json5 b/packages/client/src/themes/d-green-lime.json5 index c06e9af715..a6983b9ac2 100644 --- a/packages/client/src/themes/d-green-lime.json5 +++ b/packages/client/src/themes/d-green-lime.json5 @@ -1,7 +1,7 @@ { id: '02816013-8107-440f-877e-865083ffe194', - name: 'Mi Dark', + name: 'Mi Green+Lime Dark', author: 'syuilo', base: 'dark', diff --git a/packages/client/src/themes/d-green-orange.json5 b/packages/client/src/themes/d-green-orange.json5 new file mode 100644 index 0000000000..62adc39e29 --- /dev/null +++ b/packages/client/src/themes/d-green-orange.json5 @@ -0,0 +1,24 @@ +{ + id: 'dc489603-27b5-424a-9b25-1ff6aec9824a', + + name: 'Mi Green+Orange Dark', + author: 'syuilo', + + base: 'dark', + + props: { + accent: '#e97f00', + bg: '#0C1210', + fg: '#dee7e4', + fgHighlighted: '#fff', + fgOnAccent: '#192320', + divider: '#e7fffb24', + panel: '#192320', + panelHeaderBg: '@panel', + panelHeaderDivider: '@divider', + popup: '#293330', + renote: '@accent', + mentionMe: '#b4e900', + link: '#24d7ce', + }, +} diff --git a/packages/client/src/themes/d-ice.json5 b/packages/client/src/themes/d-ice.json5 index c095bf287b..179b060dcf 100644 --- a/packages/client/src/themes/d-ice.json5 +++ b/packages/client/src/themes/d-ice.json5 @@ -1,7 +1,7 @@ { id: '66e7e5a9-cd43-42cd-837d-12f47841fa34', - name: 'Ice Dark', + name: 'Mi Ice Dark', author: 'syuilo', base: 'dark', diff --git a/packages/client/src/themes/d-persimmon.json5 b/packages/client/src/themes/d-persimmon.json5 index ec1728d079..e36265ff10 100644 --- a/packages/client/src/themes/d-persimmon.json5 +++ b/packages/client/src/themes/d-persimmon.json5 @@ -1,7 +1,7 @@ { id: 'c503d768-7c70-4db2-a4e6-08264304bc8d', - name: 'Persimmon Dark', + name: 'Mi Persimmon Dark', author: 'syuilo', base: 'dark', diff --git a/packages/client/src/themes/d-u0.json5 b/packages/client/src/themes/d-u0.json5 index b5fe92cbc6..67c9235df0 100644 --- a/packages/client/src/themes/d-u0.json5 +++ b/packages/client/src/themes/d-u0.json5 @@ -1,7 +1,7 @@ { id: '7a5bc13b-df8f-4d44-8e94-4452f0c634bb', base: 'dark', - name: 'U0 Dark', + name: 'Mi U0 Dark', props: { X2: ':darken<2<@panel', X3: 'rgba(255, 255, 255, 0.05)', diff --git a/packages/client/src/themes/l-apricot.json5 b/packages/client/src/themes/l-apricot.json5 index c1a8b29c0e..1ed5525575 100644 --- a/packages/client/src/themes/l-apricot.json5 +++ b/packages/client/src/themes/l-apricot.json5 @@ -1,7 +1,7 @@ { id: '0ff48d43-aab3-46e7-ab12-8492110d2e2b', - name: 'Apricot Light', + name: 'Mi Apricot Light', author: 'syuilo', base: 'light', diff --git a/packages/client/src/themes/l-catppuccin-latte.json5 b/packages/client/src/themes/l-catppuccin-latte.json5 deleted file mode 100644 index 085e66df65..0000000000 --- a/packages/client/src/themes/l-catppuccin-latte.json5 +++ /dev/null @@ -1,94 +0,0 @@ -{ - id: "169661d2-5a17-4dfc-b71b-9938cbbbed3e", - base: "light", - name: "Catppuccin Latte", - props: { - X2: ":darken<2<@panel", - X3: "rgba(255, 255, 255, 0.05)", - X4: "rgba(255, 255, 255, 0.1)", - X5: "rgba(255, 255, 255, 0.05)", - X6: "rgba(255, 255, 255, 0.15)", - X7: "rgba(255, 255, 255, 0.05)", - X8: ":lighten<5<@accent", - X9: ":darken<5<@accent", - bg: "#dce0e8", - fg: "#4c4f69", - X10: ":alpha<0.4<@accent", - X11: "rgba(0, 0, 0, 0.3)", - X12: "rgba(255, 255, 255, 0.1)", - X13: "rgba(255, 255, 255, 0.15)", - X14: ":alpha<0.5<@navBg", - X15: ":alpha<0<@panel", - X16: ":alpha<0.7<@panel", - X17: ":alpha<0.8<@bg", - cwBg: "#bcc0cc", - cwFg: "#5c5f77", - link: "#1e66f5", - warn: "#fe640b", - badge: "#1e66f5", - error: "#d20f39", - focus: ":alpha<0.3<@accent", - navBg: "@panel", - navFg: "@fg", - panel: ":lighten<3<@bg", - popup: ":lighten<3<@panel", - accent: "#8839ef", - header: ":alpha<0.7<@panel", - infoBg: "#ccd0da", - infoFg: "#6c6f85", - renote: "#1e66f5", - shadow: "rgba(0, 0, 0, 0.3)", - divider: "rgba(255, 255, 255, 0.1)", - hashtag: "#209fb5", - mention: "@accent", - modalBg: "rgba(0, 0, 0, 0.5)", - success: "#40a02b", - buttonBg: "rgba(255, 255, 255, 0.05)", - switchBg: "rgba(255, 255, 255, 0.15)", - acrylicBg: ":alpha<0.5<@bg", - cwHoverBg: "#acb0be", - indicator: "@accent", - mentionMe: "@mention", - messageBg: "@bg", - navActive: "@accent", - accentedBg: ":alpha<0.15<@accent", - codeNumber: "#40a02b", - codeString: "#fe640b", - fgOnAccent: "#eff1f5", - infoWarnBg: "#ccd0da", - infoWarnFg: "#5c5f77", - navHoverFg: ":lighten<17<@fg", - swutchOnBg: "@accentedBg", - swutchOnFg: "@accent", - codeBoolean: "@accent", - dateLabelFg: "@fg", - deckDivider: "#9ca0b0", - inputBorder: "rgba(255, 255, 255, 0.1)", - panelBorder: "solid 1px var(--divider)", - swutchOffBg: "rgba(255, 255, 255, 0.1)", - swutchOffFg: "@fg", - accentDarken: ":darken<10<@accent", - acrylicPanel: ":alpha<0.5<@panel", - navIndicator: "@indicator", - windowHeader: ":alpha<0.85<@panel", - accentLighten: ":lighten<10<@accent", - buttonHoverBg: "rgba(255, 255, 255, 0.1)", - driveFolderBg: ":alpha<0.3<@accent", - fgHighlighted: ":lighten<3<@fg", - fgTransparent: ":alpha<0.5<@fg", - panelHeaderBg: ":lighten<3<@panel", - panelHeaderFg: "@fg", - buttonGradateA: "@accent", - buttonGradateB: ":hue<20<@accent", - htmlThemeColor: "@bg", - panelHighlight: ":lighten<3<@panel", - listItemHoverBg: "rgba(255, 255, 255, 0.03)", - scrollbarHandle: "rgba(255, 255, 255, 0.2)", - inputBorderHover: "rgba(255, 255, 255, 0.2)", - wallpaperOverlay: "rgba(0, 0, 0, 0.5)", - fgTransparentWeak: ":alpha<0.75<@fg", - panelHeaderDivider: "rgba(0, 0, 0, 0)", - scrollbarHandleHover: "rgba(255, 255, 255, 0.4)", - }, - author: "somebody ¯_(ツ)_/¯", -} diff --git a/packages/client/src/themes/l-cherry.json5 b/packages/client/src/themes/l-cherry.json5 index 9aab308fcd..5ad240241e 100644 --- a/packages/client/src/themes/l-cherry.json5 +++ b/packages/client/src/themes/l-cherry.json5 @@ -1,7 +1,7 @@ { id: 'ac168876-f737-4074-a3fc-a370c732ef48', - name: 'Cherry Light', + name: 'Mi Cherry Light', author: 'syuilo', base: 'light', diff --git a/packages/client/src/themes/l-coffee.json5 b/packages/client/src/themes/l-coffee.json5 index 252b5989cb..fbcd4fa9ef 100644 --- a/packages/client/src/themes/l-coffee.json5 +++ b/packages/client/src/themes/l-coffee.json5 @@ -1,7 +1,7 @@ { id: '6ed80faa-74f0-42c2-98e4-a64d9e138eab', - name: 'Coffee Light', + name: 'Mi Coffee Light', author: 'syuilo', base: 'light', diff --git a/packages/client/src/themes/l-rainy.json5 b/packages/client/src/themes/l-rainy.json5 index a7b8718067..283dd74c6c 100644 --- a/packages/client/src/themes/l-rainy.json5 +++ b/packages/client/src/themes/l-rainy.json5 @@ -1,7 +1,7 @@ { id: 'a58a0abb-ff8c-476a-8dec-0ad7837e7e96', - name: 'Rainy Light', + name: 'Mi Rainy Light', author: 'syuilo', base: 'light', diff --git a/packages/client/src/themes/l-sushi.json5 b/packages/client/src/themes/l-sushi.json5 index d14f322931..5846927d65 100644 --- a/packages/client/src/themes/l-sushi.json5 +++ b/packages/client/src/themes/l-sushi.json5 @@ -1,7 +1,7 @@ { id: '213273e5-7d20-d5f0-6e36-1b6a4f67115c', - name: 'Sushi Light', + name: 'Mi Sushi Light', author: 'syuilo', base: 'light', diff --git a/packages/client/src/themes/l-u0.json5 b/packages/client/src/themes/l-u0.json5 index 1d89e0543c..03b114ba39 100644 --- a/packages/client/src/themes/l-u0.json5 +++ b/packages/client/src/themes/l-u0.json5 @@ -1,7 +1,7 @@ { id: 'e2c940b5-6e9a-4c03-b738-261c720c426d', base: 'light', - name: 'U0 Light', + name: 'Mi U0 Light', props: { X2: ':darken<2<@panel', X3: 'rgba(255, 255, 255, 0.05)', diff --git a/packages/client/src/themes/l-vivid.json5 b/packages/client/src/themes/l-vivid.json5 index cd35626a14..b3c08f38ae 100644 --- a/packages/client/src/themes/l-vivid.json5 +++ b/packages/client/src/themes/l-vivid.json5 @@ -1,7 +1,7 @@ { id: '6128c2a9-5c54-43fe-a47d-17942356470b', - name: 'Vivid Light', + name: 'Mi Vivid Light', author: 'syuilo', base: 'light',