From ac026e26c9097797a5ffdcbf158db7b5b3c13714 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Tue, 15 Jul 2025 18:33:36 +0800 Subject: [PATCH] theme: Improve theme color fallbacks and add more themes. (#1063) --- crates/story/src/themes.rs | 5 + crates/ui/src/theme/schema.rs | 38 ++-- themes/adventure.json | 19 +- themes/alduin.json | 1 - themes/ayu.json | 27 +-- themes/catppuccin.json | 35 +--- themes/gruvbox.json | 20 +- themes/harper.json | 179 +++++++++++++++++ themes/hybrid.json | 4 +- themes/kibble.json | 182 +++++++++++++++++ themes/macos-classic.json | 19 +- themes/mandarin-square.json | 184 +++++++++++++++++ themes/matrix.json | 187 +++++++++++++++++ themes/mellifluous.json | 368 ++++++++++++++++++++++++++++++++++ themes/molokai.json | 16 +- themes/solarized.json | 4 +- themes/spaceduck.json | 5 +- themes/twilight.json | 1 - 18 files changed, 1186 insertions(+), 108 deletions(-) create mode 100644 themes/harper.json create mode 100644 themes/kibble.json create mode 100644 themes/mandarin-square.json create mode 100644 themes/matrix.json create mode 100644 themes/mellifluous.json diff --git a/crates/story/src/themes.rs b/crates/story/src/themes.rs index 31eccf95..fbc1130e 100644 --- a/crates/story/src/themes.rs +++ b/crates/story/src/themes.rs @@ -45,9 +45,14 @@ static THEMES: LazyLock> = LazyLock::new(|| { include_str!("../../../themes/catppuccin.json"), include_str!("../../../themes/everforest.json"), include_str!("../../../themes/gruvbox.json"), + include_str!("../../../themes/harper.json"), include_str!("../../../themes/hybrid.json"), include_str!("../../../themes/jellybeans.json"), + include_str!("../../../themes/kibble.json"), include_str!("../../../themes/macos-classic.json"), + include_str!("../../../themes/mandarin-square.json"), + include_str!("../../../themes/matrix.json"), + include_str!("../../../themes/mellifluous.json"), include_str!("../../../themes/molokai.json"), include_str!("../../../themes/solarized.json"), include_str!("../../../themes/spaceduck.json"), diff --git a/crates/ui/src/theme/schema.rs b/crates/ui/src/theme/schema.rs index c52ee52c..89ed5ca1 100644 --- a/crates/ui/src/theme/schema.rs +++ b/crates/ui/src/theme/schema.rs @@ -428,15 +428,15 @@ impl Theme { apply_color!(border); apply_color!(foreground); apply_color!(muted); - apply_color!(muted_foreground); + apply_color!(muted_foreground, fallback = self.foreground.opacity(0.7)); apply_color!(primary); - apply_color!(primary_active); - apply_color!(primary_foreground); - apply_color!(primary_hover); + apply_color!(primary_active, fallback = self.primary.darken(0.1)); + apply_color!(primary_foreground, fallback = self.foreground); + apply_color!(primary_hover, fallback = self.primary.opacity(0.9)); apply_color!(secondary); - apply_color!(secondary_active); - apply_color!(secondary_foreground); - apply_color!(secondary_hover); + apply_color!(secondary_active, fallback = self.secondary.darken(0.1)); + apply_color!(secondary_foreground, fallback = self.foreground); + apply_color!(secondary_hover, fallback = self.secondary.opacity(0.9)); // Other colors apply_color!(accent, fallback = self.secondary); @@ -453,9 +453,9 @@ impl Theme { apply_color!(chart_4, fallback = self.blue.darken(0.2)); apply_color!(chart_5, fallback = self.blue.darken(0.4)); apply_color!(danger, fallback = self.red); - apply_color!(danger_active, fallback = self.danger.opacity(0.95)); - apply_color!(danger_foreground); - apply_color!(danger_hover, fallback = self.danger); + apply_color!(danger_active, fallback = self.danger.darken(0.1)); + apply_color!(danger_foreground, fallback = self.primary_foreground); + apply_color!(danger_hover, fallback = self.danger.opacity(0.9)); apply_color!(description_list_label, fallback = self.border.opacity(0.2)); apply_color!( description_list_label_foreground, @@ -464,9 +464,9 @@ impl Theme { apply_color!(drag_border, fallback = self.primary.opacity(0.65)); apply_color!(drop_target, fallback = self.primary.opacity(0.2)); apply_color!(info, fallback = self.cyan); - apply_color!(info_active, fallback = self.info); - apply_color!(info_foreground); - apply_color!(info_hover, fallback = self.info.opacity(0.95)); + apply_color!(info_active, fallback = self.info.darken(0.1)); + apply_color!(info_foreground, fallback = self.primary_foreground); + apply_color!(info_hover, fallback = self.info.opacity(0.9)); apply_color!(input, fallback = self.border); apply_color!(link, fallback = self.primary); apply_color!(link_active, fallback = self.link); @@ -499,9 +499,9 @@ impl Theme { apply_color!(slider_bar, fallback = self.primary); apply_color!(slider_thumb, fallback = self.primary_foreground); apply_color!(success, fallback = self.green); - apply_color!(success_foreground); - apply_color!(success_hover, fallback = self.success.opacity(0.95)); - apply_color!(success_active, fallback = self.success); + apply_color!(success_foreground, fallback = self.primary_foreground); + apply_color!(success_hover, fallback = self.success.opacity(0.9)); + apply_color!(success_active, fallback = self.success.darken(0.1)); apply_color!(switch, fallback = self.secondary); apply_color!(tab, fallback = self.background); apply_color!(tab_active, fallback = self.background); @@ -521,9 +521,9 @@ impl Theme { apply_color!(title_bar_border, fallback = self.border); apply_color!(tiles, fallback = self.background); apply_color!(warning, fallback = self.yellow); - apply_color!(warning_active, fallback = self.warning); - apply_color!(warning_hover, fallback = self.warning.opacity(0.95)); - apply_color!(warning_foreground); + apply_color!(warning_active, fallback = self.warning.darken(0.1)); + apply_color!(warning_hover, fallback = self.warning.opacity(0.9)); + apply_color!(warning_foreground, fallback = self.primary_foreground); apply_color!(overlay); apply_color!(window_border, fallback = self.border); diff --git a/themes/adventure.json b/themes/adventure.json index d280ebc3..ec15800a 100644 --- a/themes/adventure.json +++ b/themes/adventure.json @@ -15,8 +15,8 @@ "border": "#333333", "card.background": "#003a5b", "card.foreground": "#feffff", - "danger.active.background": "#ff5874", - "danger.foreground": "#040404", + "danger.background": "#d84a33", + "danger.active.background": "#d84a33", "danger.hover.background": "#ff6e6e", "foreground": "#feffff", "input.border": "#333333", @@ -57,10 +57,10 @@ "base.green.light": "#99b52c", "base.blue": "#417ab3", "base.blue.light": "#97d7ef", - "base.cyan": "#bdcfe5", - "base.cyan.light": "#bdcfe5", - "base.magenta": "#e5c499", - "base.magenta.light": "#aa7900", + "base.cyan": "#41b3a9", + "base.cyan.light": "#97efd6", + "base.magenta": "#aa7900", + "base.magenta.light": "#e5c499", "base.yellow": "#eebb6e", "base.yellow.light": "#ffb670" }, @@ -206,9 +206,6 @@ "border": "#333150", "card.background": "#003a5b", "card.foreground": "#f8dcc0", - "danger.active.background": "#ff5874", - "danger.foreground": "#1f1d45", - "danger.hover.background": "#ff6e6e", "foreground": "#f8dcc0", "input.border": "#555465", "link.active.foreground": "#4b61bf", @@ -249,8 +246,8 @@ "base.green.light": "#9eff6e", "base.blue": "#0f4ac6", "base.blue.light": "#1997c6", - "base.cyan": "#c8faf4", - "base.cyan.light": "#c8faf4", + "base.cyan": "#00bd8e", + "base.cyan.light": "#5afcd4", "base.magenta": "#665993", "base.magenta.light": "#9b5953", "base.yellow": "#e7741e", diff --git a/themes/alduin.json b/themes/alduin.json index 2cea58b4..2b37c915 100644 --- a/themes/alduin.json +++ b/themes/alduin.json @@ -16,7 +16,6 @@ "card.foreground": "#ebdbb2", "danger.background": "#cc241d", "danger.active.background": "#cc241d", - "danger.foreground": "#282828", "danger.hover.background": "#fb4934", "foreground": "#9E9E9E", "input.border": "#504945", diff --git a/themes/ayu.json b/themes/ayu.json index 7b002394..aecd1ef5 100644 --- a/themes/ayu.json +++ b/themes/ayu.json @@ -15,10 +15,6 @@ "ring": "#FF9940", "card.background": "#F3F4F5", "card.foreground": "#5C6773", - "danger.background": "#F07171", - "danger.active.background": "#F07171", - "danger.foreground": "#FAFAFA", - "danger.hover.background": "#F07171", "input.border": "#D9DCE3", "list.active.background": "#55B4D422", "list.active.border": "#55B4D4", @@ -37,9 +33,9 @@ "scrollbar.background": "#FAFAFA00", "scrollbar.thumb.background": "#D9DCE3", "secondary.active.background": "#ECECED", - "secondary.background": "#F3F4F5", + "secondary.background": "#F0F1F2", "secondary.foreground": "#5C6773", - "secondary.hover.background": "#ECECED99", + "secondary.hover.background": "#F0F1F2EE", "tab.active.background": "#fafafa", "tab.active.foreground": "#5C6773", "tab.background": "#ECECED00", @@ -49,14 +45,14 @@ "title_bar.border": "#CFD1D2", "base.yellow": "#e7c547", "base.yellow.light": "#ffc94a", - "base.red": "#ff3333", - "base.red.light": "#ff6565", + "base.red": "#F07171", + "base.red.light": "#F0717188", "base.blue": "#41a6d9", "base.blue.light": "#73d8ff", "base.green": "#86b300", "base.geeen.light": "#b8e532", - "base.magenta": "#f07178", - "base.magenta.light": "#ffa3aa", + "base.magenta": "#9371f0", + "base.magenta.light": "#9371f088", "base.cyan": "#95e6cb", "base.cyan.light": "#7ff1cb" }, @@ -203,9 +199,6 @@ "card.background": "#1F2126", "card.foreground": "#B3B1AD", "danger.background": "#F07178", - "danger.active.background": "#F07178", - "danger.foreground": "#0A0E14", - "danger.hover.background": "#F07178", "foreground": "#B3B1AD", "input.border": "#444444", "list.active.background": "#36A3D922", @@ -232,14 +225,14 @@ "tab.foreground": "#82807d", "tab_bar.background": "#13151A", "base.yellow": "#e7c547", - "base.red": "#ff3333", - "base.red.light": "#ff6565", + "base.red": "#F07178", + "base.red.light": "#F0717888", "base.blue": "#36a3d9", "base.blue.light": "#68d5ff", "base.green": "#b8cc52", "base.green.light": "#eafe84", - "base.magenta": "#f07178", - "base.magenta.light": "#ffa3aa", + "base.magenta": "#b283f8", + "base.magenta.light": "#b283f888", "base.cyan": "#95e6cb", "base.cyan.light": "#c7fffd" }, diff --git a/themes/catppuccin.json b/themes/catppuccin.json index 9aaac52e..01f370c8 100644 --- a/themes/catppuccin.json +++ b/themes/catppuccin.json @@ -15,10 +15,6 @@ "ring": "#c6d0f5", "card.background": "#dce0e8", "card.foreground": "#4c4f69", - "danger.background": "#dc8a78", - "danger.active.background": "#dc8a78", - "danger.foreground": "#4c4f69", - "danger.hover.background": "#dc8a78", "foreground": "#4c4f69", "input.border": "#acb0be", "link.active.foreground": "#7287fd", @@ -32,7 +28,6 @@ "muted.foreground": "#9a9db2", "panel.background": "#dce0e8", "popover.background": "#EFF1F5", - "popover.foreground": "#4c4f69", "primary.active.background": "#7287fd", "primary.background": "#7287fd", "primary.foreground": "#EFF1F5", @@ -50,13 +45,13 @@ "tab_bar.background": "#DCE0E8", "title_bar.background": "#DCE0E8", "title_bar.border": "#bec3d0", - "base.red": "#d20f39", - "base.green": "#40a02b", + "base.red": "#dc8a78", + "base.green": "#85dc78", "base.yellow": "#df8e1d", - "base.blue": "#1e66f5", - "base.magenta": "#9978dc", + "base.blue": "#78acdc", + "base.magenta": "#8778dc", "base.magenta.light": "#9978dc66", - "base.cyan": "#179299" + "base.cyan": "#78dcc1" }, "highlight": { "editor.foreground": "#4c4f69", @@ -67,9 +62,9 @@ "conflict": "#d20f39", "conflict.background": "#f2d5cf", "conflict.border": "#d20f39", - "created": "#40a02b", + "created": "#85dc78", "created.background": "#dce0e8", - "created.border": "#40a02b", + "created.border": "#85dc78", "deleted": "#dc8a78", "deleted.background": "#f2d5cf", "deleted.border": "#dc8a78", @@ -97,9 +92,9 @@ "renamed": "#9978dc", "renamed.background": "#dce0e8", "renamed.border": "#9978dc", - "success": "#40a02b", + "success": "#85dc78", "success.background": "#dce0e8", - "success.border": "#40a02b", + "success.border": "#85dc78", "unreachable": "#acb0be", "unreachable.background": "#EFF1F5", "unreachable.border": "#CCD0DA", @@ -140,7 +135,7 @@ "color": "#209fb5" }, "string": { - "color": "#40a02b" + "color": "#85dc78" }, "string.documentation": { "color": "#179299" @@ -447,10 +442,6 @@ "ring": "#f2d5cf", "card.background": "#414559", "card.foreground": "#c6d0f5", - "danger.background": "#e78284", - "danger.active.background": "#e78284", - "danger.foreground": "#c6d0f5", - "danger.hover.background": "#e78284", "foreground": "#c6d0f5", "input.border": "#51576d", "list.active.background": "#8caaee11", @@ -463,7 +454,7 @@ "popover.foreground": "#c6d0f5", "primary.active.background": "#8caaee", "primary.background": "#8caaee", - "primary.foreground": "#303446", + "primary.foreground": "#e6eafb", "primary.hover.background": "#8caaee", "scrollbar.background": "#30344600", "scrollbar.thumb.background": "#51576d", @@ -604,9 +595,6 @@ "card.background": "#363a4f", "card.foreground": "#cad3f5", "danger.background": "#ed8796", - "danger.active.background": "#ed8796", - "danger.foreground": "#cad3f5", - "danger.hover.background": "#ed8796", "foreground": "#cad3f5", "input.border": "#494d64", "link.active.foreground": "#8aadf4", @@ -786,7 +774,6 @@ "card.foreground": "#cdd6f4", "danger.background": "#f38ba8", "danger.active.background": "#eba0ac", - "danger.foreground": "#cdd6f4", "danger.hover.background": "#f38ba8", "foreground": "#cdd6f4", "input.border": "#6c7086", diff --git a/themes/gruvbox.json b/themes/gruvbox.json index 4f803545..f540557c 100644 --- a/themes/gruvbox.json +++ b/themes/gruvbox.json @@ -14,6 +14,7 @@ "border": "#d5c4a1", "card.background": "#ebdbb2", "card.foreground": "#3c3836", + "danger.background": "#fb4934", "danger.active.background": "#cc241d", "danger.foreground": "#fbf1c7", "danger.hover.background": "#fb4934", @@ -48,8 +49,8 @@ "title_bar.background": "#ebdbb2", "title_bar.border": "#d5c4a1", "base.magenta.light": "#D3869B66", - "base.red": "#9d0006", - "base.green": "#79740e", + "base.red": "#fb4934", + "base.green": "#67a64f", "base.yellow": "#b57614", "base.blue": "#076678", "base.magenta": "#8f3f71", @@ -196,9 +197,8 @@ "border": "#3e3936", "card.background": "#282828", "card.foreground": "#ebdbb2", - "danger.active.background": "#cc241d", - "danger.foreground": "#ebdbb2", - "danger.hover.background": "#fb4934", + "danger.active.background": "#fb4934", + "danger.hover.background": "#fb5c4a", "foreground": "#ebdbb2", "input.border": "#504945", "link.active.foreground": "#83a598", @@ -230,7 +230,7 @@ "title_bar.background": "#282828", "title_bar.border": "#3e3936", "base.magenta.light": "#D3869B66", - "base.red": "#cc241d", + "base.red": "#f06555", "base.green": "#98971a", "base.yellow": "#d79921", "base.blue": "#458588", @@ -243,12 +243,12 @@ "editor.active_line.background": "#131313", "editor.line_number": "#8F8F8F", "editor.active_line_number": "#DDDDDD", - "conflict": "#D2602D", + "conflict": "#f06555", "created": "#3f72e2", "created.background": "#0C4619", - "deleted.background": "#46190C", - "error.background": "#46190C", - "error.border": "#802207", + "deleted.background": "#f06555", + "error.background": "#f06555", + "error.border": "#f06555", "hidden": "#9E9E9E", "hint": "#b283f8", "hint.background": "#250c4b", diff --git a/themes/harper.json b/themes/harper.json new file mode 100644 index 00000000..265d7664 --- /dev/null +++ b/themes/harper.json @@ -0,0 +1,179 @@ +[ + { + "name": "Harper", + "author": "iTerm2-Color-Schemes", + "url": "https://github.com/mbadolato/iTerm2-Color-Schemes", + "mode": "dark", + "colors": { + "accent.background": "#18151B", + "accent.foreground": "#a8a49d", + "accordion.active.background": "#003a5b", + "accordion.background": "#010101", + "accordion.hover.background": "#726E69", + "background": "#010101", + "border": "#333333", + "card.background": "#003a5b", + "card.foreground": "#a8a49d", + "foreground": "#a8a49d", + "input.border": "#333333", + "list.active.background": "#B196C611", + "list.active.border": "#B196C644", + "list.even.background": "#18151B77", + "muted.background": "#333333", + "muted.foreground": "#726E69", + "panel.background": "#003a5b", + "popover.background": "#010101", + "popover.foreground": "#a8a49d", + "primary.active.background": "#B196C699", + "primary.background": "#B196C6", + "primary.foreground": "#000000", + "primary.hover.background": "#b89fcb", + "scrollbar.background": "#003a5b00", + "scrollbar.thumb.background": "#726E69", + "secondary.background": "#1b1b1b", + "secondary.active.background": "#1b1b1b99", + "secondary.foreground": "#A8A49D", + "secondary.hover.background": "#232323", + "tab.active.background": "#010101", + "tab.active.foreground": "#a8a49d", + "tab.foreground": "#787878", + "base.red": "#ff5874", + "base.red.light": "#ff587499", + "base.green": "#489e48", + "base.green.light": "#489e4899", + "base.blue": "#7fb5e1", + "base.blue.light": "#7fb5e199", + "base.cyan": "#bff5e5", + "base.cyan.light": "#bff5e599", + "base.magenta": "#b296c6", + "base.magenta.light": "#b296c699", + "base.yellow": "#f8b63f", + "base.yellow.light": "#f8b63f99" + }, + "highlight": { + "editor.foreground": "#a8a49d", + "editor.background": "#010101", + "editor.active_line.background": "#18151B", + "editor.line_number": "#726E69", + "editor.active_line_number": "#a8a49d", + "conflict": "#ff5874", + "conflict.background": "#18151B", + "conflict.border": "#ff5874", + "created": "#489e48", + "created.background": "#18151B", + "created.border": "#489e48", + "deleted": "#ff5874", + "deleted.background": "#18151B", + "deleted.border": "#ff5874", + "error": "#ff5874", + "error.background": "#18151B", + "error.border": "#ff5874", + "hidden": "#726E69", + "hidden.background": "#18151B", + "hidden.border": "#333333", + "hint": "#7fb5e1", + "hint.background": "#18151B", + "hint.border": "#7fb5e1", + "ignored": "#726E69", + "ignored.background": "#18151B", + "ignored.border": "#333333", + "info": "#7fb5e1", + "info.background": "#18151B", + "info.border": "#7fb5e1", + "modified": "#b296c6", + "modified.background": "#18151B", + "modified.border": "#b296c6", + "predictive": "#726E69", + "predictive.background": "#18151B", + "predictive.border": "#333333", + "renamed": "#b296c6", + "renamed.background": "#18151B", + "renamed.border": "#b296c6", + "success": "#489e48", + "success.background": "#18151B", + "success.border": "#489e48", + "unreachable": "#726E69", + "unreachable.background": "#18151B", + "unreachable.border": "#333333", + "warning": "#f8b63f", + "warning.background": "#18151B", + "warning.border": "#f8b63f", + "syntax": { + "attribute": { + "color": "#b296c6" + }, + "boolean": { + "color": "#f8b63f" + }, + "comment": { + "color": "#726E69", + "font_style": "italic" + }, + "comment.doc": { + "color": "#726E69", + "font_style": "italic" + }, + "constant": { + "color": "#f8b63f" + }, + "constructor": { + "color": "#b296c6" + }, + "embedded": { + "color": "#a8a49d" + }, + "function": { + "color": "#f8b63f" + }, + "keyword": { + "color": "#ff5874" + }, + "link_text": { + "color": "#7fb5e1", + "font_style": "normal" + }, + "link_uri": { + "color": "#bff5e5", + "font_style": "italic" + }, + "number": { + "color": "#ff5874" + }, + "string": { + "color": "#489e48" + }, + "string.escape": { + "color": "#489e48" + }, + "string.regex": { + "color": "#489e48" + }, + "string.special": { + "color": "#f8b63f" + }, + "string.special.symbol": { + "color": "#f8b63f" + }, + "tag": { + "color": "#b296c6" + }, + "text.literal": { + "color": "#f8b63f" + }, + "title": { + "color": "#b296c6", + "font_weight": 600 + }, + "type": { + "color": "#b296c6" + }, + "property": { + "color": "#a8a49d" + }, + "variable.special": { + "color": "#ff5874" + } + } + } + } +] diff --git a/themes/hybrid.json b/themes/hybrid.json index 996c4d47..a10dd3f0 100644 --- a/themes/hybrid.json +++ b/themes/hybrid.json @@ -198,8 +198,6 @@ "card.background": "#1D1F21", "card.foreground": "#e8e8e8", "danger.background": "#ff5f5f", - "danger.active.background": "#ff5f5f", - "danger.foreground": "#1D1F21", "danger.hover.background": "#ff8787", "foreground": "#e8e8e8", "input.border": "#282A2E", @@ -231,7 +229,7 @@ "tab_bar.background": "#242627", "title_bar.background": "#242629", "title_bar.border": "#34373c", - "base.red": "#b84d51", + "base.red": "#ff5f5f", "base.green": "#b3bf5a", "base.yellow": "#e4b55e", "base.blue": "#6e90b0", diff --git a/themes/kibble.json b/themes/kibble.json new file mode 100644 index 00000000..fe2af3b4 --- /dev/null +++ b/themes/kibble.json @@ -0,0 +1,182 @@ +[ + { + "name": "Kibble", + "author": "iTerm2-Color-Schemes", + "url": "https://github.com/mbadolato/iTerm2-Color-Schemes", + "mode": "dark", + "colors": { + "accent.background": "#242223", + "accent.foreground": "#f7f7f7", + "accordion.active.background": "#003a5b", + "accordion.background": "#0e100a", + "accordion.hover.background": "#726E69", + "background": "#0e100a", + "border": "#333333", + "card.background": "#003a5b", + "card.foreground": "#f7f7f7", + "danger.background": "#c70031", + "danger.active.background": "#c7003199", + "danger.hover.background": "#e00038", + "foreground": "#f7f7f7", + "input.border": "#333333", + "list.active.background": "#3448D122", + "list.active.border": "#3448D1", + "list.even.background": "#24222355", + "muted.background": "#333333", + "muted.foreground": "#726E69", + "panel.background": "#003a5b", + "popover.background": "#0e100a", + "popover.foreground": "#f7f7f7", + "primary.active.background": "#3449d199", + "primary.background": "#3449d1", + "primary.foreground": "#f7f7f7", + "primary.hover.background": "#4457d5", + "scrollbar.background": "#003a5b00", + "scrollbar.thumb.background": "#726E69", + "secondary.background": "#3d3d3d", + "secondary.active.background": "#2d2d2d", + "secondary.foreground": "#f7f7f7", + "secondary.hover.background": "#404040", + "tab.active.background": "#0e100a", + "tab.active.foreground": "#f7f7f7", + "tab.foreground": "#969696", + "base.red": "#C70231", + "base.red.light": "#f01578", + "base.green": "#2BCF13", + "base.green.light": "#6ce05c", + "base.blue": "#3449d1", + "base.blue.light": "#97a4f7", + "base.cyan": "#0798ab", + "base.cyan.light": "#68f2e0", + "base.magenta": "#8400ff", + "base.magenta.light": "#C495F0", + "base.yellow": "#c7a302", + "base.yellow.light": "#f3f79e" + }, + "highlight": { + "editor.foreground": "#f7f7f7", + "editor.background": "#0e100a", + "editor.active_line.background": "#242223", + "editor.line_number": "#726E69", + "editor.active_line_number": "#f7f7f7", + "conflict": "#c70031", + "conflict.background": "#0e100a", + "conflict.border": "#e00038", + "created": "#2BCF13", + "created.background": "#0e100a", + "created.border": "#6ce05c", + "deleted": "#c70031", + "deleted.background": "#0e100a", + "deleted.border": "#e00038", + "error": "#c70031", + "error.background": "#0e100a", + "error.border": "#e00038", + "hidden": "#726E69", + "hidden.background": "#242223", + "hidden.border": "#333333", + "hint": "#0798ab", + "hint.background": "#242223", + "hint.border": "#68f2e0", + "ignored": "#726E69", + "ignored.background": "#242223", + "ignored.border": "#333333", + "info": "#0798ab", + "info.background": "#242223", + "info.border": "#68f2e0", + "modified": "#3449d1", + "modified.background": "#0e100a", + "modified.border": "#4457d5", + "predictive": "#726E69", + "predictive.background": "#242223", + "predictive.border": "#333333", + "renamed": "#3449d1", + "renamed.background": "#0e100a", + "renamed.border": "#4457d5", + "success": "#2BCF13", + "success.background": "#0e100a", + "success.border": "#6ce05c", + "unreachable": "#726E69", + "unreachable.background": "#242223", + "unreachable.border": "#333333", + "warning": "#c7a302", + "warning.background": "#0e100a", + "warning.border": "#f3f79e", + "syntax": { + "attribute": { + "color": "#3449d1" + }, + "boolean": { + "color": "#c7a302" + }, + "comment": { + "color": "#726E69", + "font_style": "italic" + }, + "comment.doc": { + "color": "#726E69", + "font_style": "italic" + }, + "constant": { + "color": "#c7a302" + }, + "constructor": { + "color": "#3449d1" + }, + "embedded": { + "color": "#f7f7f7" + }, + "function": { + "color": "#c7a302" + }, + "keyword": { + "color": "#c70031" + }, + "link_text": { + "color": "#0798ab", + "font_style": "normal" + }, + "link_uri": { + "color": "#68f2e0", + "font_style": "italic" + }, + "number": { + "color": "#c70031" + }, + "string": { + "color": "#2BCF13" + }, + "string.escape": { + "color": "#2BCF13" + }, + "string.regex": { + "color": "#2BCF13" + }, + "string.special": { + "color": "#c7a302" + }, + "string.special.symbol": { + "color": "#c7a302" + }, + "tag": { + "color": "#3449d1" + }, + "text.literal": { + "color": "#c7a302" + }, + "title": { + "color": "#3449d1", + "font_weight": 600 + }, + "type": { + "color": "#3449d1" + }, + "property": { + "color": "#f7f7f7" + }, + "variable.special": { + "color": "#c70031" + } + } + } + } +] diff --git a/themes/macos-classic.json b/themes/macos-classic.json index d2a27abf..e6bface8 100644 --- a/themes/macos-classic.json +++ b/themes/macos-classic.json @@ -208,17 +208,18 @@ "tab.background": "#232323", "tab.foreground": "#8F8F8F", "tab_bar.background": "#232323", - "base.yellow": "#E1D797", - "base.red": "#A8473B", - "base.red.light": "#DD6F61", - "base.blue": "#3f72e2", - "base.blue.light": "#81A9F6", - "base.green": "#76BA53", - "base.green.light": "#9DE478", + "base.blue": "#082190", + "base.blue.light": "#3f72e2", + "base.cyan": "#3DB6B0", + "base.cyan.light": "#5BDFD8", + "base.green": "#0C4619", + "base.green.light": "#76BA53", "base.magenta": "#AE30C2", "base.magenta.light": "#D86DE9", - "base.cyan": "#3DB6B0", - "base.cyan.light": "#5BDFD8" + "base.red": "#A8473B", + "base.red.light": "#DD6F61", + "base.yellow": "#3A310E", + "base.yellow.light": "#7B6508" }, "highlight": { "editor.foreground": "#DDDDDD", diff --git a/themes/mandarin-square.json b/themes/mandarin-square.json new file mode 100644 index 00000000..f0d7b25f --- /dev/null +++ b/themes/mandarin-square.json @@ -0,0 +1,184 @@ +[ + { + "name": "Mandarin Square", + "url": "https://en.wikipedia.org/wiki/Mandarin_square", + "mode": "dark", + "colors": { + "accent.background": "#2B2525", + "accent.foreground": "#ebdbb2", + "accordion.active.background": "#504945", + "accordion.background": "#282828", + "accordion.hover.background": "#665c54", + "background": "#110D10", + "border": "#312B32", + "card.background": "#282828", + "card.foreground": "#ebdbb2", + "danger.background": "#cc241d", + "danger.active.background": "#cc241d", + "danger.foreground": "#282828", + "danger.hover.background": "#fb4934", + "foreground": "#F0DBC6", + "input.border": "#504945", + "list.active.background": "#7F5B2128", + "list.active.border": "#D99832", + "list.even.background": "#28282899", + "muted.background": "#3c3836", + "muted.foreground": "#878787", + "panel.background": "#282828", + "popover.background": "#1B1717", + "popover.foreground": "#ebdbb2", + "primary.active.background": "#324a8f99", + "primary.background": "#324a8f", + "primary.foreground": "#c6cdf0", + "primary.hover.background": "#38519f", + "scrollbar.background": "#28282844", + "scrollbar.thumb.background": "#504945", + "secondary.background": "#312C31", + "secondary.active.background": "#201B20", + "secondary.foreground": "#D5BBA3", + "secondary.hover.background": "#3b353b", + "tab.active.background": "#110D10", + "tab.active.foreground": "#ebdbb2", + "tab.background": "#1B171700", + "tab.foreground": "#928d81", + "tab_bar.background": "#110D10", + "title_bar.background": "#110D10", + "title_bar.border": "#312B32", + "base.blue": "#33467F", + "base.cyan": "#A0C4D8", + "base.green": "#55743e", + "base.magenta": "#522431", + "base.magenta.light": "#52243188", + "base.red": "#B51E00", + "base.yellow": "#D99832", + "warning.foreground": "#282828", + "success.foreground": "#ebdbb2", + "info.foreground": "#282828" + }, + "highlight": { + "editor.foreground": "#ebdbb2", + "editor.background": "#282828", + "editor.active_line.background": "#3c3836", + "editor.line_number": "#928374", + "editor.active_line_number": "#ebdbb2", + "conflict": "#cc241d", + "conflict.background": "#3c3836", + "conflict.border": "#9d0006", + "created": "#7c6f64", + "created.background": "#504945", + "created.border": "#b57614", + "deleted": "#9d0006", + "deleted.background": "#3c3836", + "deleted.border": "#cc241d", + "error": "#cc241d", + "error.background": "#3c3836", + "error.border": "#9d0006", + "hidden": "#928374", + "hidden.background": "#504945", + "hidden.border": "#665c54", + "hint": "#83a598", + "hint.background": "#504945", + "hint.border": "#076678", + "ignored": "#928374", + "ignored.background": "#504945", + "ignored.border": "#665c54", + "info": "#83a598", + "info.background": "#504945", + "info.border": "#076678", + "modified": "#b57614", + "modified.background": "#504945", + "modified.border": "#d79921", + "predictive": "#928374", + "predictive.background": "#504945", + "predictive.border": "#665c54", + "renamed": "#b57614", + "renamed.background": "#504945", + "renamed.border": "#d79921", + "success": "#7c6f64", + "success.background": "#504945", + "success.border": "#b57614", + "unreachable": "#928374", + "unreachable.background": "#504945", + "unreachable.border": "#665c54", + "warning": "#d79921", + "warning.background": "#504945", + "warning.border": "#b57614", + "syntax": { + "attribute": { + "color": "#d79921" + }, + "boolean": { + "color": "#d79921" + }, + "comment": { + "color": "#928374", + "font_style": "italic" + }, + "comment.doc": { + "color": "#928374", + "font_style": "italic" + }, + "constant": { + "color": "#d79921" + }, + "constructor": { + "color": "#b57614" + }, + "embedded": { + "color": "#ebdbb2" + }, + "function": { + "color": "#d79921" + }, + "keyword": { + "color": "#cc241d" + }, + "link_text": { + "color": "#83a598", + "font_style": "normal" + }, + "link_uri": { + "color": "#076678", + "font_style": "italic" + }, + "number": { + "color": "#cc241d" + }, + "string": { + "color": "#7c6f64" + }, + "string.escape": { + "color": "#7c6f64" + }, + "string.regex": { + "color": "#7c6f64" + }, + "string.special": { + "color": "#d79921" + }, + "string.special.symbol": { + "color": "#d79921" + }, + "tag": { + "color": "#b57614" + }, + "text.literal": { + "color": "#d79921" + }, + "title": { + "color": "#b57614", + "font_weight": 600 + }, + "type": { + "color": "#b57614" + }, + "property": { + "color": "#ebdbb2" + }, + "variable.special": { + "color": "#cc241d" + } + } + } + } +] diff --git a/themes/matrix.json b/themes/matrix.json new file mode 100644 index 00000000..eb414f7e --- /dev/null +++ b/themes/matrix.json @@ -0,0 +1,187 @@ +[ + { + "name": "Matrix", + "author": "iruzo", + "url": "https://github.com/iruzo/matrix-nvim", + "mode": "dark", + "colors": { + "accent.background": "#003200", + "accent.foreground": "#00FF00", + "accordion.active.background": "#001900", + "accordion.background": "#0D0208", + "accordion.hover.background": "#003200", + "background": "#020d02", + "border": "#12410E", + "window_border": "#156B12", + "ring": "#00FF00", + "card.background": "#001900", + "card.foreground": "#00FF00", + "danger.background": "#FF0000", + "danger.active.background": "#FF0000", + "danger.foreground": "#0D0208", + "danger.hover.background": "#FF0000", + "foreground": "#88FF88", + "input.border": "#003200", + "link.active.foreground": "#00FF00", + "link.foreground": "#00FF00", + "link.hover.foreground": "#00FF00", + "list.active.background": "#00190066", + "list.active.border": "#00FF00", + "list.even.background": "#00190066", + "muted.background": "#001900", + "muted.foreground": "#007700", + "panel.background": "#001900", + "popover.background": "#0D0208", + "popover.foreground": "#00FF00", + "primary.active.background": "#00FF0099", + "primary.background": "#00FF00", + "primary.foreground": "#0D0208", + "primary.hover.background": "#00FF00AA", + "scrollbar.background": "#0D020800", + "scrollbar.thumb.background": "#003d00", + "secondary.active.background": "#001B00", + "secondary.background": "#002900", + "secondary.foreground": "#3fd43a", + "secondary.hover.background": "#003300", + "tab.active.background": "#0D0208", + "tab.active.foreground": "#00FF00", + "tab.background": "#0D020800", + "tab.foreground": "#88FF88", + "tab_bar.background": "#0D0208", + "title_bar.background": "#020d02", + "title_bar.border": "#12410E", + "color.red": "#23755a", + "color.green": "#82d967", + "color.yellow": "#ffd700", + "color.blue": "#3f5242", + "color.magenta": "#FF00FF", + "color.magenta.light": "#FF00FF22", + "color.cyan": "#50b45a" + }, + "highlight": { + "editor.foreground": "#88FF88", + "editor.background": "#020d02", + "editor.active_line.background": "#001900", + "editor.line_number": "#007700", + "editor.active_line_number": "#00FF00", + "conflict": "#FF0000", + "conflict.background": "#0D0208", + "conflict.border": "#12410E", + "created": "#82d967", + "created.background": "#001900", + "created.border": "#156B12", + "deleted": "#FF0000", + "deleted.background": "#0D0208", + "deleted.border": "#12410E", + "error": "#FF0000", + "error.background": "#0D0208", + "error.border": "#12410E", + "hidden": "#007700", + "hidden.background": "#001900", + "hidden.border": "#12410E", + "hint": "#3fd43a", + "hint.background": "#001900", + "hint.border": "#156B12", + "ignored": "#007700", + "ignored.background": "#001900", + "ignored.border": "#12410E", + "info": "#3fd43a", + "info.background": "#001900", + "info.border": "#156B12", + "modified": "#82d967", + "modified.background": "#001900", + "modified.border": "#156B12", + "predictive": "#007700", + "predictive.background": "#001900", + "predictive.border": "#12410E", + "renamed": "#82d967", + "renamed.background": "#001900", + "renamed.border": "#156B12", + "success": "#82d967", + "success.background": "#001900", + "success.border": "#156B12", + "unreachable": "#007700", + "unreachable.background": "#001900", + "unreachable.border": "#12410E", + "warning": "#ffd700", + "warning.background": "#001900", + "warning.border": "#156B12", + "syntax": { + "attribute": { + "color": "#82d967" + }, + "boolean": { + "color": "#ffd700" + }, + "comment": { + "color": "#007700", + "font_style": "italic" + }, + "comment.doc": { + "color": "#007700", + "font_style": "italic" + }, + "constant": { + "color": "#ffd700" + }, + "constructor": { + "color": "#82d967" + }, + "embedded": { + "color": "#88FF88" + }, + "function": { + "color": "#ffd700" + }, + "keyword": { + "color": "#FF0000" + }, + "link_text": { + "color": "#3fd43a", + "font_style": "normal" + }, + "link_uri": { + "color": "#00FF00", + "font_style": "italic" + }, + "number": { + "color": "#FF0000" + }, + "string": { + "color": "#82d967" + }, + "string.escape": { + "color": "#82d967" + }, + "string.regex": { + "color": "#82d967" + }, + "string.special": { + "color": "#ffd700" + }, + "string.special.symbol": { + "color": "#ffd700" + }, + "tag": { + "color": "#82d967" + }, + "text.literal": { + "color": "#ffd700" + }, + "title": { + "color": "#82d967", + "font_weight": 600 + }, + "type": { + "color": "#82d967" + }, + "property": { + "color": "#88FF88" + }, + "variable.special": { + "color": "#FF0000" + } + } + } + } +] diff --git a/themes/mellifluous.json b/themes/mellifluous.json new file mode 100644 index 00000000..23b025ad --- /dev/null +++ b/themes/mellifluous.json @@ -0,0 +1,368 @@ +[ + { + "name": "Mellifluous Light", + "author": "Ramojus Lapinskas", + "url": "https://github.com/ramojus/mellifluous.nvim", + "mode": "light", + "colors": { + "accent.background": "#d5d5d5", + "accent.foreground": "#383a42", + "accordion.active.background": "#fafafa", + "accordion.background": "#e5e5e5", + "accordion.hover.background": "#d5d5d5", + "background": "#E7E7E7", + "border": "#CACACA", + "card.background": "#fafafa", + "card.foreground": "#383a42", + "danger.active.background": "#e06c75", + "danger.foreground": "#21252b", + "danger.hover.background": "#be5046", + "foreground": "#383a42", + "input.border": "#d5d5d5", + "link.active.foreground": "#5A6599", + "link.foreground": "#5A6599", + "link.hover.foreground": "#5A6599", + "list.hover.background": "#d5d5d5", + "list.active.background": "#60606022", + "list.active.border": "#5A6599", + "list.even.background": "#F0F0F0", + "muted.background": "#e5e5e5", + "muted.foreground": "#828997", + "panel.background": "#fafafa", + "popover.background": "#E4E4E4", + "popover.foreground": "#383a42", + "primary.active.background": "#5A6599AA", + "primary.background": "#5A6599", + "primary.foreground": "#F0F0F0", + "primary.hover.background": "#626ca2", + "scrollbar.background": "#fafafa33", + "scrollbar.thumb.background": "#929292", + "secondary.background": "#F0F0F0", + "secondary.active.background": "#d5d5d5", + "secondary.foreground": "#383a42", + "secondary.hover.background": "#FAFAFA", + "tab.active.background": "#E7E7E7", + "tab.active.foreground": "#383a42", + "tab.background": "#F0F0F000", + "tab.foreground": "#727272", + "tab_bar.background": "#E7E7E7", + "title_bar.background": "#E7E7E7", + "title_bar.border": "#CACACA", + "base.red": "#C95954", + "base.green": "#828040", + "base.yellow": "#cbaa89", + "base.blue": "#a8a1be", + "base.magenta": "#b39fb0", + "base.magenta.light": "#9C699588", + "base.cyan": "#c0af8c", + "success.background": "#71c738" + }, + "highlight": { + "editor.foreground": "#383a42", + "editor.background": "#E7E7E7", + "editor.active_line.background": "#d5d5d5", + "editor.line_number": "#727272", + "editor.active_line_number": "#383a42", + "conflict": "#e06c75", + "conflict.background": "#E7E7E7", + "conflict.border": "#be5046", + "created": "#828040", + "created.background": "#F0F0F0", + "created.border": "#929292", + "deleted": "#be5046", + "deleted.background": "#E7E7E7", + "deleted.border": "#e06c75", + "error": "#e06c75", + "error.background": "#E7E7E7", + "error.border": "#be5046", + "hidden": "#727272", + "hidden.background": "#d5d5d5", + "hidden.border": "#cacaca", + "hint": "#5A6599", + "hint.background": "#d5d5d5", + "hint.border": "#626ca2", + "ignored": "#727272", + "ignored.background": "#d5d5d5", + "ignored.border": "#cacaca", + "info": "#5A6599", + "info.background": "#d5d5d5", + "info.border": "#626ca2", + "modified": "#727272", + "modified.background": "#F0F0F0", + "modified.border": "#cacaca", + "predictive": "#727272", + "predictive.background": "#d5d5d5", + "predictive.border": "#cacaca", + "renamed": "#727272", + "renamed.background": "#F0F0F0", + "renamed.border": "#cacaca", + "success": "#828040", + "success.background": "#F0F0F0", + "success.border": "#727272", + "unreachable": "#727272", + "unreachable.background": "#d5d5d5", + "unreachable.border": "#cacaca", + "warning": "#cbaa89", + "warning.background": "#F0F0F0", + "warning.border": "#727272", + "syntax": { + "attribute": { + "color": "#727272" + }, + "boolean": { + "color": "#cbaa89" + }, + "comment": { + "color": "#A0A0A0", + "font_style": "italic" + }, + "comment.doc": { + "color": "#A0A0A0", + "font_style": "italic" + }, + "constant": { + "color": "#cbaa89" + }, + "constructor": { + "color": "#727272" + }, + "embedded": { + "color": "#383a42" + }, + "function": { + "color": "#cbaa89" + }, + "keyword": { + "color": "#e06c75" + }, + "link_text": { + "color": "#5A6599", + "font_style": "normal" + }, + "link_uri": { + "color": "#5A6599", + "font_style": "italic" + }, + "number": { + "color": "#e06c75" + }, + "string": { + "color": "#828040" + }, + "string.escape": { + "color": "#828040" + }, + "string.regex": { + "color": "#828040" + }, + "string.special": { + "color": "#cbaa89" + }, + "string.special.symbol": { + "color": "#cbaa89" + }, + "tag": { + "color": "#727272" + }, + "text.literal": { + "color": "#cbaa89" + }, + "title": { + "color": "#727272", + "font_weight": 600 + }, + "type": { + "color": "#727272" + }, + "property": { + "color": "#383a42" + }, + "variable.special": { + "color": "#e06c75" + } + } + } + }, + { + "name": "Mellifluous Dark", + "author": "Ramojus Lapinskas", + "url": "https://github.com/ramojus/mellifluous.nvim", + "mode": "dark", + "colors": { + "accent.background": "#292929", + "accent.foreground": "#abb2bf", + "accordion.active.background": "#282c34", + "accordion.background": "#3e4451", + "accordion.hover.background": "#444444", + "background": "#1A1A1A", + "border": "#444444", + "card.background": "#282c34", + "card.foreground": "#abb2bf", + "danger.active.background": "#e06c75", + "danger.foreground": "#21252b", + "danger.hover.background": "#be5046", + "foreground": "#abb2bf", + "input.border": "#444444", + "link.active.foreground": "#5A6599", + "link.foreground": "#5A6599", + "link.hover.foreground": "#5A6599", + "list.active.background": "#5A659922", + "list.active.border": "#5A6599", + "list.even.background": "#29292988", + "muted.background": "#3e4451", + "muted.foreground": "#828997", + "panel.background": "#282c34", + "popover.background": "#1A1A1A", + "popover.foreground": "#abb2bf", + "primary.active.background": "#5A6599AA", + "primary.background": "#5A6599", + "primary.foreground": "#ecedf4", + "primary.hover.background": "#626ca2", + "scrollbar.background": "#282c3400", + "scrollbar.thumb.background": "#444444", + "secondary.background": "#292929", + "secondary.active.background": "#3A3A3A", + "secondary.foreground": "#abb2bf", + "secondary.hover.background": "#2E2E2E", + "tab.active.background": "#1A1A1A", + "tab.active.foreground": "#abb2bf", + "tab.background": "#1A1A1A00", + "tab.foreground": "#abb2bf", + "tab_bar.background": "#292929", + "title_bar.background": "#1A1A1A", + "title_bar.border": "#444444", + "base.red": "#C95954", + "base.green": "#828040", + "base.yellow": "#d19a66", + "base.blue": "#56b6c2", + "base.magenta": "#9C6995", + "base.magenta.light": "#9C699577", + "base.cyan": "#74A39E" + }, + "highlight": { + "editor.foreground": "#abb2bf", + "editor.background": "#1A1A1A", + "editor.active_line.background": "#292929", + "editor.line_number": "#828997", + "editor.active_line_number": "#abb2bf", + "conflict": "#e06c75", + "conflict.background": "#1A1A1A", + "conflict.border": "#be5046", + "created": "#828040", + "created.background": "#292929", + "created.border": "#929292", + "deleted": "#be5046", + "deleted.background": "#1A1A1A", + "deleted.border": "#e06c75", + "error": "#e06c75", + "error.background": "#1A1A1A", + "error.border": "#be5046", + "hidden": "#828997", + "hidden.background": "#292929", + "hidden.border": "#444444", + "hint": "#5A6599", + "hint.background": "#292929", + "hint.border": "#626ca2", + "ignored": "#828997", + "ignored.background": "#292929", + "ignored.border": "#444444", + "info": "#5A6599", + "info.background": "#292929", + "info.border": "#626ca2", + "modified": "#929292", + "modified.background": "#292929", + "modified.border": "#444444", + "predictive": "#828997", + "predictive.background": "#292929", + "predictive.border": "#444444", + "renamed": "#929292", + "renamed.background": "#292929", + "renamed.border": "#444444", + "success": "#828040", + "success.background": "#292929", + "success.border": "#929292", + "unreachable": "#828997", + "unreachable.background": "#292929", + "unreachable.border": "#444444", + "warning": "#d19a66", + "warning.background": "#292929", + "warning.border": "#929292", + "syntax": { + "attribute": { + "color": "#929292" + }, + "boolean": { + "color": "#d19a66" + }, + "comment": { + "color": "#828997", + "font_style": "italic" + }, + "comment.doc": { + "color": "#828997", + "font_style": "italic" + }, + "constant": { + "color": "#d19a66" + }, + "constructor": { + "color": "#929292" + }, + "embedded": { + "color": "#abb2bf" + }, + "function": { + "color": "#d19a66" + }, + "keyword": { + "color": "#e06c75" + }, + "link_text": { + "color": "#5A6599", + "font_style": "normal" + }, + "link_uri": { + "color": "#5A6599", + "font_style": "italic" + }, + "number": { + "color": "#e06c75" + }, + "string": { + "color": "#828040" + }, + "string.escape": { + "color": "#828040" + }, + "string.regex": { + "color": "#828040" + }, + "string.special": { + "color": "#d19a66" + }, + "string.special.symbol": { + "color": "#d19a66" + }, + "tag": { + "color": "#929292" + }, + "text.literal": { + "color": "#d19a66" + }, + "title": { + "color": "#929292", + "font_weight": 600 + }, + "type": { + "color": "#929292" + }, + "property": { + "color": "#abb2bf" + }, + "variable.special": { + "color": "#e06c75" + } + } + } + } +] diff --git a/themes/molokai.json b/themes/molokai.json index 4a8078c5..19ddb768 100644 --- a/themes/molokai.json +++ b/themes/molokai.json @@ -192,9 +192,9 @@ "border": "#3b3b3b", "card.background": "#272822", "card.foreground": "#f8f8f2", - "danger.active.background": "#ff0000", - "danger.foreground": "#1b1d1e", - "danger.hover.background": "#ff3333", + "danger.background": "#802207", + "danger.active.background": "#802207", + "danger.hover.background": "#802207CC", "foreground": "#f8f8f2", "input.border": "#3b3b3b", "list.active.background": "#f9267211", @@ -205,9 +205,9 @@ "panel.background": "#1b1d1e", "popover.background": "#1b1d1e", "popover.foreground": "#f8f8f2", - "primary.active.background": "#dc1860", - "primary.background": "#f92672", - "primary.foreground": "#1b1d1e", + "primary.active.background": "#ae144d", + "primary.background": "#dc1860", + "primary.foreground": "#f8f8f2", "primary.hover.background": "#f9347c", "scrollbar.background": "#1b1d1e00", "scrollbar.thumb.background": "#4b4b4b", @@ -218,8 +218,8 @@ "table.row.border": "#3b3b3b70", "title_bar.background": "#262723", "title_bar.border": "#3b3b3b", - "base.red": "#f92672", - "base.green": "#98e123", + "base.red": "#dc1860", + "base.green": "#76BA53", "base.yellow": "#dfd460", "base.blue": "#fd971f", "base.magenta": "#AE81FF", diff --git a/themes/solarized.json b/themes/solarized.json index cd85a3ec..466a8315 100644 --- a/themes/solarized.json +++ b/themes/solarized.json @@ -61,7 +61,9 @@ "base.magenta.light": "#D4398433", "base.cyan": "#2aa198", "base.cyan.light": "#93a1a1", - "success.background": "#739900" + "success.foreground": "#FDF6E3", + "warning.foreground": "#FDF6E3", + "info.foreground": "#FDF6E3" }, "highlight": { "editor.foreground": "#586E75", diff --git a/themes/spaceduck.json b/themes/spaceduck.json index 16b34235..d372f1e5 100644 --- a/themes/spaceduck.json +++ b/themes/spaceduck.json @@ -14,9 +14,7 @@ "border": "#272C42", "card.background": "#003a5b", "card.foreground": "#ecf0c1", - "danger.active.background": "#ff5874", - "danger.foreground": "#0F111B", - "danger.hover.background": "#ff6e6e", + "danger.background": "#e33400", "foreground": "#ecf0c1", "input.border": "#272C42", "link.active.foreground": "#089CC5", @@ -32,7 +30,6 @@ "popover.foreground": "#ecf0c1", "primary.active.background": "#0788ac", "primary.background": "#089CC5", - "primary.foreground": "#0F111B", "primary.hover.background": "#09afdd", "scrollbar.background": "#003a5b00", "scrollbar.thumb.background": "#4b6479", diff --git a/themes/twilight.json b/themes/twilight.json index 34ef36ff..e9a29d84 100644 --- a/themes/twilight.json +++ b/themes/twilight.json @@ -15,7 +15,6 @@ "card.background": "#1e1e1e", "card.foreground": "#dcdcdc", "danger.active.background": "#c93636", - "danger.foreground": "#CDA86988", "danger.hover.background": "#d15252", "foreground": "#dcdcdc", "input.border": "#3e3e3e",