From a4155964cfaa69cf14cadc4406ce706feca8e6a0 Mon Sep 17 00:00:00 2001 From: davfsa Date: Mon, 12 Aug 2024 16:58:25 +0200 Subject: [PATCH] fix: switch from deprecated opacity specifier to #RGBA feat: improve git diff colouring --- .gitattributes | 2 +- .../jvmMain/resources/catppuccin-frappe.json | 249 +++++++++--------- .../jvmMain/resources/catppuccin-latte.json | 249 +++++++++--------- .../resources/catppuccin-macchiato.json | 249 +++++++++--------- .../jvmMain/resources/catppuccin-mocha.json | 249 +++++++++--------- fleet.tera | 208 ++++++++------- 6 files changed, 619 insertions(+), 587 deletions(-) diff --git a/.gitattributes b/.gitattributes index c712070..2f59319 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ * text=auto eol=lf -plugin/frontendImpl/src/jvmMain/resources/catppuccin-*.json linguist-generated=true +catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-*.json linguist-generated=true diff --git a/catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-frappe.json b/catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-frappe.json index cf1da40..4e04ed3 100644 --- a/catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-frappe.json +++ b/catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-frappe.json @@ -41,8 +41,8 @@ "button.primary.focusOutline": "Transparent", "button.primary.background.default": "Mauve", "button.primary.background.disabled": "Overlay1", - "button.primary.background.hovered": "ca9ee670%", - "button.primary.background.pressed": "ca9ee660%", + "button.primary.background.hovered": "#ca9ee6cc", + "button.primary.background.pressed": "#ca9ee699", "button.primary.text.default": "Crust", "button.primary.text.disabled": "Subtext0", "button.primary.text.hovered": "Crust", @@ -56,8 +56,8 @@ "button.secondary.focusOutline": "Transparent", "button.secondary.background.default": "Surface0", "button.secondary.background.disabled": "Surface0", - "button.secondary.background.hovered": "41455960%", - "button.secondary.background.pressed": "41455940%", + "button.secondary.background.hovered": "#41455999", + "button.secondary.background.pressed": "#41455966", "button.secondary.text.default": "Text", "button.secondary.text.disabled": "Surface2", "button.secondary.text.hovered": "Text", @@ -70,9 +70,9 @@ "button.positive.focusBorder": "Transparent", "button.positive.focusOutline": "Transparent", "button.positive.background.default": "Green", - "button.positive.background.disabled": "a6d18940%", - "button.positive.background.hovered": "a6d18970%", - "button.positive.background.pressed": "a6d18960%", + "button.positive.background.disabled": "#a6d18966", + "button.positive.background.hovered": "#a6d189b3", + "button.positive.background.pressed": "#a6d18999", "button.positive.text.default": "Crust", "button.positive.text.disabled": "Subtext0", "button.positive.text.hovered": "Crust", @@ -85,9 +85,9 @@ "button.dangerous.focusBorder": "Transparent", "button.dangerous.focusOutline": "Transparent", "button.dangerous.background.default": "Red", - "button.dangerous.background.disabled": "e7828440%", - "button.dangerous.background.hovered": "e7828470%", - "button.dangerous.background.pressed": "e7828460%", + "button.dangerous.background.disabled": "#e7828466", + "button.dangerous.background.hovered": "#e78284b3", + "button.dangerous.background.pressed": "#e7828499", "button.dangerous.text.default": "Crust", "button.dangerous.text.disabled": "Subtext0", "button.dangerous.text.hovered": "Crust", @@ -101,8 +101,8 @@ "button.tile.focusOutline": "Transparent", "button.tile.background.default": "Mantle", "button.tile.background.disabled": "Mantle", - "button.tile.background.hovered": "41455960%", - "button.tile.background.pressed": "41455940%", + "button.tile.background.hovered": "#41455999", + "button.tile.background.pressed": "#41455966", "button.tile.text.default": "Text", "button.tile.text.disabled": "Surface2", "button.tile.text.hovered": "Text", @@ -131,8 +131,8 @@ "toggleButton.on.focusBorder": "Transparent", "toggleButton.on.background.default": "Lavender", "toggleButton.on.background.disabled": "Overlay0", - "toggleButton.on.background.hovered": "babbf170%", - "toggleButton.on.background.pressed": "babbf160%", + "toggleButton.on.background.hovered": "#babbf1b3", + "toggleButton.on.background.pressed": "#babbf199", "toggleButton.on.text.default": "Crust", "toggleButton.on.text.hovered": "Crust", "toggleButton.on.text.pressed": "Crust", @@ -142,8 +142,8 @@ "toggleButton.off.focusBorder": "Transparent", "toggleButton.off.background.default": "Surface0", "toggleButton.off.background.disabled": "Overlay0", - "toggleButton.off.background.hovered": "41455960%", - "toggleButton.off.background.pressed": "41455940%", + "toggleButton.off.background.hovered": "#41455999", + "toggleButton.off.background.pressed": "#41455966", "toggleButton.off.text.default": "Text", "toggleButton.off.text.hovered": "Text", "toggleButton.off.text.pressed": "Text", @@ -210,8 +210,8 @@ "editor.text": "Text", "editor.caret.background": "Text", "editor.whitespace.text": "Text", - "editor.currentLine.background.default": "73799410%", - "editor.currentLine.background.focused": "73799410%", + "editor.currentLine.background.default": "#7379941a", + "editor.currentLine.background.focused": "#7379941a", "editor.lineNumber.current": "Mauve", "editor.lineNumber.default": "Overlay0", "editor.gitDiff.background.added": "Green", @@ -251,11 +251,9 @@ "completion.match.background": "Transparent", "completion.match.text": "Flamingo", - "search.match.background": "e5c89080%", + "search.match.background": "#e5c890cc", "search.match.text": "Crust", - "dnd": "ffffff20%", - "icon.background.blue": "Blue", "icon.background.green": "Green", "icon.background.orange": "Peach", @@ -307,10 +305,10 @@ "progressBar.indeterminate.foreground": "Pink", "progressBar.indeterminate.foregroundAccent": "Mauve", - "scrollbar.thumb.default": "ffffff20%", - "scrollbar.thumb.hovered": "ffffff40%", + "scrollbar.thumb.default": "#ffffff33", + "scrollbar.thumb.hovered": "#ffffff66", "scrollbar.track.default": "Transparent", - "scrollbar.track.hovered": "ffffff20%", + "scrollbar.track.hovered": "#ffffff33", "tab.background.default": "Mantle", "tab.background.selected": "Surface0", @@ -380,23 +378,23 @@ "settings.modified.indicator": "Yellow", - "dragAndDrop.background": "ffffff10%", + "dragAndDrop.background": "#ffffff1A", "problemsWidget.checkmark.foreground": "Green", - "problemsWidget.checkmark.background": "a6d18930%", - "problemsWidget.status.expanded.background.error": "ab2123", - "problemsWidget.status.expanded.background.warning": "ba8b2c", - "problemsWidget.status.expanded.background.weakWarning": "533e13", + "problemsWidget.checkmark.background": "#a6d1894d", + "problemsWidget.status.expanded.background.error": "#ab2123", + "problemsWidget.status.expanded.background.warning": "#ba8b2c", + "problemsWidget.status.expanded.background.weakWarning": "#533e13", - "problemsWidget.status.expanded.border.error": "d62a2d", - "problemsWidget.status.expanded.border.warning": "ba8b2c", - "problemsWidget.status.expanded.border.weakWarning": "cf9a31", + "problemsWidget.status.expanded.border.error": "#d62a2d", + "problemsWidget.status.expanded.border.warning": "#ba8b2c", + "problemsWidget.status.expanded.border.weakWarning": "#cf9a31", "gitBranchTag.local.text": "Text", - "gitBranchTag.local.background": "8caaee10%", + "gitBranchTag.local.background": "#8caaee1a", "gitBranchTag.local.border": "Blue", "gitBranchTag.remote.text": "Text", - "gitBranchTag.remote.background": "ca9ee610%", + "gitBranchTag.remote.background": "#ca9ee61a", "gitBranchTag.remote.border": "Mauve", "remoteWorkspaceStatusLabel.background.ssh": "Green", @@ -408,16 +406,16 @@ "remoteWorkspaceStatusLabel.text.docker": "Crust", "remoteWorkspaceStatusLabel.text.space": "Crust", - "remote.userColor.background.one": "f2d5cf70%", - "remote.userColor.background.two": "f4b8e470%", - "remote.userColor.background.three": "babbf170%", - "remote.userColor.background.four": "ca9ee670%", - "remote.userColor.background.five": "ea999c70%", - "remote.userColor.background.six": "ef9f7670%", - "remote.userColor.background.seven": "e5c89070%", - "remote.userColor.background.eight": "a6d18970%", - "remote.userColor.background.nine": "81c8be70%", - "remote.userColor.background.ten": "8caaee70%", + "remote.userColor.background.one": "#f2d5cfb3", + "remote.userColor.background.two": "#f4b8e4b3", + "remote.userColor.background.three": "#babbf1b3", + "remote.userColor.background.four": "#ca9ee6b3", + "remote.userColor.background.five": "#ea999cb3", + "remote.userColor.background.six": "#ef9f76b3", + "remote.userColor.background.seven": "#e5c890b3", + "remote.userColor.background.eight": "#a6d189b3", + "remote.userColor.background.nine": "#81c8beb3", + "remote.userColor.background.ten": "#8caaeeb3", "ai.inputField.background.default": "Mantle", "ai.inputField.border.default": "Transparent", @@ -432,8 +430,8 @@ "ai.button.default.focusOutline": "Transparent", "ai.button.default.background.default": "Surface0", "ai.button.default.background.disabled": "Surface0", - "ai.button.default.background.hovered": "41455960%", - "ai.button.default.background.pressed": "41455940%", + "ai.button.default.background.hovered": "#41455999", + "ai.button.default.background.pressed": "#41455966", "ai.button.default.text.default": "Text", "ai.button.default.text.disabled": "Surface2", "ai.button.default.text.hovered": "Text", @@ -447,8 +445,8 @@ "ai.button.recipe.focusOutline": "Transparent", "ai.button.recipe.background.default": "Surface0", "ai.button.recipe.background.disabled": "Surface0", - "ai.button.recipe.background.hovered": "41455960%", - "ai.button.recipe.background.pressed": "41455940%", + "ai.button.recipe.background.hovered": "#41455999", + "ai.button.recipe.background.pressed": "#41455966", "ai.button.recipe.text.default": "Text", "ai.button.recipe.text.disabled": "Surface2", "ai.button.recipe.text.hovered": "Text", @@ -460,11 +458,11 @@ "ai.icon.text": "Mauve", "ai.icon.background": "Mauve", - "ai.icon.background.secondary": "ca9ee620%", + "ai.icon.background.secondary": "#ca9ee633", "ai.user.icon.text": "Blue", "ai.user.icon.background": "Blue", - "ai.user.icon.background.secondary": "8caaee20%", + "ai.user.icon.background.secondary": "#8caaee33", "ai.error.border": "Red", "ai.error.fill": "Transparent" @@ -498,62 +496,64 @@ "backgroundColor": "Blue" }, "diff.added": { - "backgroundColor": "a6d18920%", - "stripeColor": "a6d18920%" + "backgroundColor": "#586e5f" }, - "diff.added.empty": { - "backgroundColor": "a6d18920%", - "showEmptyIntervals": true + "diff.added.word": { + "backgroundColor": "#586e5f" }, "diff.added.withBorder": { - "backgroundColor": "a6d18920%", - "decoration": { - "color": "a6d18920%", - "style": "BORDER" + "backgroundColor": "#586e5f", + "border": { + "color": "Green" } }, - "diff.added.word": { - "backgroundColor": "a6d18920%" - }, - "diff.conflict.withBorder": { - "backgroundColor": "e7828430%", - "decoration": { - "color": "Red", - "style": "BORDER" + "diff.added.resolved": { + "backgroundColor": "Transparent", + "border": { + "color": "Green" } }, + "diff.added.empty": { + "backgroundColor": "#586e5f" + }, "diff.deleted": { - "backgroundColor": "e7828420%", - "stripeColor": "e7828420%" + "backgroundColor": "#6c495b" }, - "diff.deleted.empty": { - "backgroundColor": "e7828420%", - "showEmptyIntervals": true + "diff.deleted.word": { + "backgroundColor": "#6c495b" }, "diff.deleted.withBorder": { - "backgroundColor": "e7828420%", - "decoration": { - "color": "e7828420%", - "style": "BORDER" + "backgroundColor": "#6c495b", + "border": { + "color": "Red" } }, - "diff.deleted.word": { - "backgroundColor": "e7828420%", - "showEmptyIntervals": true + "diff.deleted.resolved": { + "backgroundColor": "Transparent", + "border": { + "color": "Red" + } + }, + "diff.deleted.empty": { + "backgroundColor": "#6c495b" }, "diff.modified": { - "backgroundColor": "8caaee20%", - "stripeColor": "8caaee20%" + "backgroundColor": "#4a587d" + }, + "diff.modified.word": { + "backgroundColor": "#5673a7" }, "diff.modified.withBorder": { - "backgroundColor": "8caaee20%", - "decoration": { - "color": "8caaee20%", - "style": "BORDER" + "backgroundColor": "#4a587d", + "border": { + "color": "Blue" } }, - "diff.modified.word": { - "backgroundColor": "8caaee20%" + "diff.modified.resolved": { + "backgroundColor": "Transparent", + "border": { + "color": "Blue" + } }, "editor.brace.match": { "backgroundColor": "Surface1" @@ -571,7 +571,7 @@ "stripeColor": "Surface0" }, "editor.search.results": { - "backgroundColor": "8caaee40%", + "backgroundColor": "#8caaee66", "stripeColor": "Blue" }, "editor.selection": { @@ -816,10 +816,10 @@ }, "problem.info": { "decoration": { - "color": "81c8be40%", + "color": "#81c8be66", "style": "BORDER" }, - "stripeColor": "81c8be40%" + "stripeColor": "#81c8be66" }, "problem.unknown": {}, "problem.unused": { @@ -834,10 +834,10 @@ }, "problem.warning.weak": { "decoration": { - "color": "e5c89040%", + "color": "#e5c89066", "thickness": 2.0 }, - "stripeColor": "e5c89040%" + "stripeColor": "#e5c89066" }, "propertyName.css": { "foregroundColor": "Blue" @@ -873,9 +873,14 @@ "foregroundColor": "Mauve" }, "snippet": { - "backgroundColor": "Blue", - "borderRadius": 4.0, - "showEmptyIntervals": true + "border": { + "color": "Surface1" + } + }, + "snippet.selected": { + "border": { + "color": "Blue" + } }, "string": { "foregroundColor": "Green" @@ -919,32 +924,32 @@ } }, "palette": { - "Rosewater": "f2d5cf", - "Flamingo": "eebebe", - "Pink": "f4b8e4", - "Mauve": "ca9ee6", - "Red": "e78284", - "Maroon": "ea999c", - "Peach": "ef9f76", - "Yellow": "e5c890", - "Green": "a6d189", - "Teal": "81c8be", - "Sky": "99d1db", - "Sapphire": "85c1dc", - "Blue": "8caaee", - "Lavender": "babbf1", - "Text": "c6d0f5", - "Subtext1": "b5bfe2", - "Subtext0": "a5adce", - "Overlay2": "949cbb", - "Overlay1": "838ba7", - "Overlay0": "737994", - "Surface2": "626880", - "Surface1": "51576d", - "Surface0": "414559", - "Base": "303446", - "Mantle": "292c3c", - "Crust": "232634", - "Transparent": "ffffff0%" + "Rosewater": "#f2d5cf", + "Flamingo": "#eebebe", + "Pink": "#f4b8e4", + "Mauve": "#ca9ee6", + "Red": "#e78284", + "Maroon": "#ea999c", + "Peach": "#ef9f76", + "Yellow": "#e5c890", + "Green": "#a6d189", + "Teal": "#81c8be", + "Sky": "#99d1db", + "Sapphire": "#85c1dc", + "Blue": "#8caaee", + "Lavender": "#babbf1", + "Text": "#c6d0f5", + "Subtext1": "#b5bfe2", + "Subtext0": "#a5adce", + "Overlay2": "#949cbb", + "Overlay1": "#838ba7", + "Overlay0": "#737994", + "Surface2": "#626880", + "Surface1": "#51576d", + "Surface0": "#414559", + "Base": "#303446", + "Mantle": "#292c3c", + "Crust": "#232634", + "Transparent": "#ffffff00" } } diff --git a/catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-latte.json b/catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-latte.json index 3618862..005bf29 100644 --- a/catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-latte.json +++ b/catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-latte.json @@ -41,8 +41,8 @@ "button.primary.focusOutline": "Transparent", "button.primary.background.default": "Mauve", "button.primary.background.disabled": "Overlay1", - "button.primary.background.hovered": "8839ef70%", - "button.primary.background.pressed": "8839ef60%", + "button.primary.background.hovered": "#8839efcc", + "button.primary.background.pressed": "#8839ef99", "button.primary.text.default": "Crust", "button.primary.text.disabled": "Subtext0", "button.primary.text.hovered": "Crust", @@ -56,8 +56,8 @@ "button.secondary.focusOutline": "Transparent", "button.secondary.background.default": "Surface0", "button.secondary.background.disabled": "Surface0", - "button.secondary.background.hovered": "ccd0da60%", - "button.secondary.background.pressed": "ccd0da40%", + "button.secondary.background.hovered": "#ccd0da99", + "button.secondary.background.pressed": "#ccd0da66", "button.secondary.text.default": "Text", "button.secondary.text.disabled": "Surface2", "button.secondary.text.hovered": "Text", @@ -70,9 +70,9 @@ "button.positive.focusBorder": "Transparent", "button.positive.focusOutline": "Transparent", "button.positive.background.default": "Green", - "button.positive.background.disabled": "40a02b40%", - "button.positive.background.hovered": "40a02b70%", - "button.positive.background.pressed": "40a02b60%", + "button.positive.background.disabled": "#40a02b66", + "button.positive.background.hovered": "#40a02bb3", + "button.positive.background.pressed": "#40a02b99", "button.positive.text.default": "Crust", "button.positive.text.disabled": "Subtext0", "button.positive.text.hovered": "Crust", @@ -85,9 +85,9 @@ "button.dangerous.focusBorder": "Transparent", "button.dangerous.focusOutline": "Transparent", "button.dangerous.background.default": "Red", - "button.dangerous.background.disabled": "d20f3940%", - "button.dangerous.background.hovered": "d20f3970%", - "button.dangerous.background.pressed": "d20f3960%", + "button.dangerous.background.disabled": "#d20f3966", + "button.dangerous.background.hovered": "#d20f39b3", + "button.dangerous.background.pressed": "#d20f3999", "button.dangerous.text.default": "Crust", "button.dangerous.text.disabled": "Subtext0", "button.dangerous.text.hovered": "Crust", @@ -101,8 +101,8 @@ "button.tile.focusOutline": "Transparent", "button.tile.background.default": "Mantle", "button.tile.background.disabled": "Mantle", - "button.tile.background.hovered": "ccd0da60%", - "button.tile.background.pressed": "ccd0da40%", + "button.tile.background.hovered": "#ccd0da99", + "button.tile.background.pressed": "#ccd0da66", "button.tile.text.default": "Text", "button.tile.text.disabled": "Surface2", "button.tile.text.hovered": "Text", @@ -131,8 +131,8 @@ "toggleButton.on.focusBorder": "Transparent", "toggleButton.on.background.default": "Lavender", "toggleButton.on.background.disabled": "Overlay0", - "toggleButton.on.background.hovered": "7287fd70%", - "toggleButton.on.background.pressed": "7287fd60%", + "toggleButton.on.background.hovered": "#7287fdb3", + "toggleButton.on.background.pressed": "#7287fd99", "toggleButton.on.text.default": "Crust", "toggleButton.on.text.hovered": "Crust", "toggleButton.on.text.pressed": "Crust", @@ -142,8 +142,8 @@ "toggleButton.off.focusBorder": "Transparent", "toggleButton.off.background.default": "Surface0", "toggleButton.off.background.disabled": "Overlay0", - "toggleButton.off.background.hovered": "ccd0da60%", - "toggleButton.off.background.pressed": "ccd0da40%", + "toggleButton.off.background.hovered": "#ccd0da99", + "toggleButton.off.background.pressed": "#ccd0da66", "toggleButton.off.text.default": "Text", "toggleButton.off.text.hovered": "Text", "toggleButton.off.text.pressed": "Text", @@ -210,8 +210,8 @@ "editor.text": "Text", "editor.caret.background": "Text", "editor.whitespace.text": "Text", - "editor.currentLine.background.default": "9ca0b010%", - "editor.currentLine.background.focused": "9ca0b010%", + "editor.currentLine.background.default": "#9ca0b01a", + "editor.currentLine.background.focused": "#9ca0b01a", "editor.lineNumber.current": "Mauve", "editor.lineNumber.default": "Overlay0", "editor.gitDiff.background.added": "Green", @@ -251,11 +251,9 @@ "completion.match.background": "Transparent", "completion.match.text": "Flamingo", - "search.match.background": "df8e1d80%", + "search.match.background": "#df8e1dcc", "search.match.text": "Crust", - "dnd": "00000020%", - "icon.background.blue": "Blue", "icon.background.green": "Green", "icon.background.orange": "Peach", @@ -307,10 +305,10 @@ "progressBar.indeterminate.foreground": "Pink", "progressBar.indeterminate.foregroundAccent": "Mauve", - "scrollbar.thumb.default": "00000020%", - "scrollbar.thumb.hovered": "00000040%", + "scrollbar.thumb.default": "#00000033", + "scrollbar.thumb.hovered": "#00000066", "scrollbar.track.default": "Transparent", - "scrollbar.track.hovered": "00000020%", + "scrollbar.track.hovered": "#00000033", "tab.background.default": "Mantle", "tab.background.selected": "Surface0", @@ -380,24 +378,24 @@ "settings.modified.indicator": "Yellow", - "dragAndDrop.background": "00000010%", + "dragAndDrop.background": "#0000001A", "problemsWidget.checkmark.foreground": "Green", - "problemsWidget.checkmark.background": "40a02b30%", - "problemsWidget.status.expanded.background.error": "be0e34", - "problemsWidget.status.expanded.background.warning": "cb821b", + "problemsWidget.checkmark.background": "#40a02b4d", + "problemsWidget.status.expanded.background.error": "#be0e34", + "problemsWidget.status.expanded.background.warning": "#cb821b", - "problemsWidget.status.expanded.background.weakWarning": "f9e9d3", + "problemsWidget.status.expanded.background.weakWarning": "#f9e9d3", - "problemsWidget.status.expanded.border.error": "ee1242", - "problemsWidget.status.expanded.border.warning": "cb821b", - "problemsWidget.status.expanded.border.weakWarning": "e2901e", + "problemsWidget.status.expanded.border.error": "#ee1242", + "problemsWidget.status.expanded.border.warning": "#cb821b", + "problemsWidget.status.expanded.border.weakWarning": "#e2901e", "gitBranchTag.local.text": "Text", - "gitBranchTag.local.background": "1e66f510%", + "gitBranchTag.local.background": "#1e66f51a", "gitBranchTag.local.border": "Blue", "gitBranchTag.remote.text": "Text", - "gitBranchTag.remote.background": "8839ef10%", + "gitBranchTag.remote.background": "#8839ef1a", "gitBranchTag.remote.border": "Mauve", "remoteWorkspaceStatusLabel.background.ssh": "Green", @@ -409,16 +407,16 @@ "remoteWorkspaceStatusLabel.text.docker": "Crust", "remoteWorkspaceStatusLabel.text.space": "Crust", - "remote.userColor.background.one": "dc8a7870%", - "remote.userColor.background.two": "ea76cb70%", - "remote.userColor.background.three": "7287fd70%", - "remote.userColor.background.four": "8839ef70%", - "remote.userColor.background.five": "e6455370%", - "remote.userColor.background.six": "fe640b70%", - "remote.userColor.background.seven": "df8e1d70%", - "remote.userColor.background.eight": "40a02b70%", - "remote.userColor.background.nine": "17929970%", - "remote.userColor.background.ten": "1e66f570%", + "remote.userColor.background.one": "#dc8a78b3", + "remote.userColor.background.two": "#ea76cbb3", + "remote.userColor.background.three": "#7287fdb3", + "remote.userColor.background.four": "#8839efb3", + "remote.userColor.background.five": "#e64553b3", + "remote.userColor.background.six": "#fe640bb3", + "remote.userColor.background.seven": "#df8e1db3", + "remote.userColor.background.eight": "#40a02bb3", + "remote.userColor.background.nine": "#179299b3", + "remote.userColor.background.ten": "#1e66f5b3", "ai.inputField.background.default": "Mantle", "ai.inputField.border.default": "Transparent", @@ -433,8 +431,8 @@ "ai.button.default.focusOutline": "Transparent", "ai.button.default.background.default": "Surface0", "ai.button.default.background.disabled": "Surface0", - "ai.button.default.background.hovered": "ccd0da60%", - "ai.button.default.background.pressed": "ccd0da40%", + "ai.button.default.background.hovered": "#ccd0da99", + "ai.button.default.background.pressed": "#ccd0da66", "ai.button.default.text.default": "Text", "ai.button.default.text.disabled": "Surface2", "ai.button.default.text.hovered": "Text", @@ -448,8 +446,8 @@ "ai.button.recipe.focusOutline": "Transparent", "ai.button.recipe.background.default": "Surface0", "ai.button.recipe.background.disabled": "Surface0", - "ai.button.recipe.background.hovered": "ccd0da60%", - "ai.button.recipe.background.pressed": "ccd0da40%", + "ai.button.recipe.background.hovered": "#ccd0da99", + "ai.button.recipe.background.pressed": "#ccd0da66", "ai.button.recipe.text.default": "Text", "ai.button.recipe.text.disabled": "Surface2", "ai.button.recipe.text.hovered": "Text", @@ -461,11 +459,11 @@ "ai.icon.text": "Mauve", "ai.icon.background": "Mauve", - "ai.icon.background.secondary": "8839ef20%", + "ai.icon.background.secondary": "#8839ef33", "ai.user.icon.text": "Blue", "ai.user.icon.background": "Blue", - "ai.user.icon.background.secondary": "1e66f520%", + "ai.user.icon.background.secondary": "#1e66f533", "ai.error.border": "Red", "ai.error.fill": "Transparent" @@ -499,62 +497,64 @@ "backgroundColor": "Blue" }, "diff.added": { - "backgroundColor": "40a02b20%", - "stripeColor": "40a02b20%" + "backgroundColor": "#cce1cd" }, - "diff.added.empty": { - "backgroundColor": "40a02b20%", - "showEmptyIntervals": true + "diff.added.word": { + "backgroundColor": "#cce1cd" }, "diff.added.withBorder": { - "backgroundColor": "40a02b20%", - "decoration": { - "color": "40a02b20%", - "style": "BORDER" + "backgroundColor": "#cce1cd", + "border": { + "color": "Green" } }, - "diff.added.word": { - "backgroundColor": "40a02b20%" - }, - "diff.conflict.withBorder": { - "backgroundColor": "d20f3920%", - "decoration": { - "color": "Red", - "style": "BORDER" + "diff.added.resolved": { + "backgroundColor": "Transparent", + "border": { + "color": "Green" } }, + "diff.added.empty": { + "backgroundColor": "#cce1cd" + }, "diff.deleted": { - "backgroundColor": "d20f3910%", - "stripeColor": "d20f3910%" + "backgroundColor": "#e9c4cf" }, - "diff.deleted.empty": { - "backgroundColor": "d20f3910%", - "showEmptyIntervals": true + "diff.deleted.word": { + "backgroundColor": "#e9c4cf" }, "diff.deleted.withBorder": { - "backgroundColor": "d20f3910%", - "decoration": { - "color": "d20f3910%", - "style": "BORDER" + "backgroundColor": "#e9c4cf", + "border": { + "color": "Red" } }, - "diff.deleted.word": { - "backgroundColor": "d20f3910%", - "showEmptyIntervals": true + "diff.deleted.resolved": { + "backgroundColor": "Transparent", + "border": { + "color": "Red" + } + }, + "diff.deleted.empty": { + "backgroundColor": "#e9c4cf" }, "diff.modified": { - "backgroundColor": "1e66f510%", - "stripeColor": "1e66f510%" + "backgroundColor": "#c7d6f7" + }, + "diff.modified.word": { + "backgroundColor": "#97b6f8" }, "diff.modified.withBorder": { - "backgroundColor": "1e66f510%", - "decoration": { - "color": "1e66f510%", - "style": "BORDER" + "backgroundColor": "#c7d6f7", + "border": { + "color": "Blue" } }, - "diff.modified.word": { - "backgroundColor": "1e66f510%" + "diff.modified.resolved": { + "backgroundColor": "Transparent", + "border": { + "color": "Blue" + } }, "editor.brace.match": { "backgroundColor": "Surface1" @@ -572,7 +572,7 @@ "stripeColor": "Surface0" }, "editor.search.results": { - "backgroundColor": "1e66f540%", + "backgroundColor": "#1e66f566", "stripeColor": "Blue" }, "editor.selection": { @@ -817,10 +817,10 @@ }, "problem.info": { "decoration": { - "color": "17929940%", + "color": "#17929966", "style": "BORDER" }, - "stripeColor": "17929940%" + "stripeColor": "#17929966" }, "problem.unknown": {}, "problem.unused": { @@ -835,10 +835,10 @@ }, "problem.warning.weak": { "decoration": { - "color": "df8e1d40%", + "color": "#df8e1d66", "thickness": 2.0 }, - "stripeColor": "df8e1d40%" + "stripeColor": "#df8e1d66" }, "propertyName.css": { "foregroundColor": "Blue" @@ -874,9 +874,14 @@ "foregroundColor": "Mauve" }, "snippet": { - "backgroundColor": "Blue", - "borderRadius": 4.0, - "showEmptyIntervals": true + "border": { + "color": "Surface1" + } + }, + "snippet.selected": { + "border": { + "color": "Blue" + } }, "string": { "foregroundColor": "Green" @@ -920,32 +925,32 @@ } }, "palette": { - "Rosewater": "dc8a78", - "Flamingo": "dd7878", - "Pink": "ea76cb", - "Mauve": "8839ef", - "Red": "d20f39", - "Maroon": "e64553", - "Peach": "fe640b", - "Yellow": "df8e1d", - "Green": "40a02b", - "Teal": "179299", - "Sky": "04a5e5", - "Sapphire": "209fb5", - "Blue": "1e66f5", - "Lavender": "7287fd", - "Text": "4c4f69", - "Subtext1": "5c5f77", - "Subtext0": "6c6f85", - "Overlay2": "7c7f93", - "Overlay1": "8c8fa1", - "Overlay0": "9ca0b0", - "Surface2": "acb0be", - "Surface1": "bcc0cc", - "Surface0": "ccd0da", - "Base": "eff1f5", - "Mantle": "e6e9ef", - "Crust": "dce0e8", - "Transparent": "ffffff0%" + "Rosewater": "#dc8a78", + "Flamingo": "#dd7878", + "Pink": "#ea76cb", + "Mauve": "#8839ef", + "Red": "#d20f39", + "Maroon": "#e64553", + "Peach": "#fe640b", + "Yellow": "#df8e1d", + "Green": "#40a02b", + "Teal": "#179299", + "Sky": "#04a5e5", + "Sapphire": "#209fb5", + "Blue": "#1e66f5", + "Lavender": "#7287fd", + "Text": "#4c4f69", + "Subtext1": "#5c5f77", + "Subtext0": "#6c6f85", + "Overlay2": "#7c7f93", + "Overlay1": "#8c8fa1", + "Overlay0": "#9ca0b0", + "Surface2": "#acb0be", + "Surface1": "#bcc0cc", + "Surface0": "#ccd0da", + "Base": "#eff1f5", + "Mantle": "#e6e9ef", + "Crust": "#dce0e8", + "Transparent": "#ffffff00" } } diff --git a/catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-macchiato.json b/catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-macchiato.json index fd5ff27..cb2491c 100644 --- a/catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-macchiato.json +++ b/catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-macchiato.json @@ -41,8 +41,8 @@ "button.primary.focusOutline": "Transparent", "button.primary.background.default": "Mauve", "button.primary.background.disabled": "Overlay1", - "button.primary.background.hovered": "c6a0f670%", - "button.primary.background.pressed": "c6a0f660%", + "button.primary.background.hovered": "#c6a0f6cc", + "button.primary.background.pressed": "#c6a0f699", "button.primary.text.default": "Crust", "button.primary.text.disabled": "Subtext0", "button.primary.text.hovered": "Crust", @@ -56,8 +56,8 @@ "button.secondary.focusOutline": "Transparent", "button.secondary.background.default": "Surface0", "button.secondary.background.disabled": "Surface0", - "button.secondary.background.hovered": "363a4f60%", - "button.secondary.background.pressed": "363a4f40%", + "button.secondary.background.hovered": "#363a4f99", + "button.secondary.background.pressed": "#363a4f66", "button.secondary.text.default": "Text", "button.secondary.text.disabled": "Surface2", "button.secondary.text.hovered": "Text", @@ -70,9 +70,9 @@ "button.positive.focusBorder": "Transparent", "button.positive.focusOutline": "Transparent", "button.positive.background.default": "Green", - "button.positive.background.disabled": "a6da9540%", - "button.positive.background.hovered": "a6da9570%", - "button.positive.background.pressed": "a6da9560%", + "button.positive.background.disabled": "#a6da9566", + "button.positive.background.hovered": "#a6da95b3", + "button.positive.background.pressed": "#a6da9599", "button.positive.text.default": "Crust", "button.positive.text.disabled": "Subtext0", "button.positive.text.hovered": "Crust", @@ -85,9 +85,9 @@ "button.dangerous.focusBorder": "Transparent", "button.dangerous.focusOutline": "Transparent", "button.dangerous.background.default": "Red", - "button.dangerous.background.disabled": "ed879640%", - "button.dangerous.background.hovered": "ed879670%", - "button.dangerous.background.pressed": "ed879660%", + "button.dangerous.background.disabled": "#ed879666", + "button.dangerous.background.hovered": "#ed8796b3", + "button.dangerous.background.pressed": "#ed879699", "button.dangerous.text.default": "Crust", "button.dangerous.text.disabled": "Subtext0", "button.dangerous.text.hovered": "Crust", @@ -101,8 +101,8 @@ "button.tile.focusOutline": "Transparent", "button.tile.background.default": "Mantle", "button.tile.background.disabled": "Mantle", - "button.tile.background.hovered": "363a4f60%", - "button.tile.background.pressed": "363a4f40%", + "button.tile.background.hovered": "#363a4f99", + "button.tile.background.pressed": "#363a4f66", "button.tile.text.default": "Text", "button.tile.text.disabled": "Surface2", "button.tile.text.hovered": "Text", @@ -131,8 +131,8 @@ "toggleButton.on.focusBorder": "Transparent", "toggleButton.on.background.default": "Lavender", "toggleButton.on.background.disabled": "Overlay0", - "toggleButton.on.background.hovered": "b7bdf870%", - "toggleButton.on.background.pressed": "b7bdf860%", + "toggleButton.on.background.hovered": "#b7bdf8b3", + "toggleButton.on.background.pressed": "#b7bdf899", "toggleButton.on.text.default": "Crust", "toggleButton.on.text.hovered": "Crust", "toggleButton.on.text.pressed": "Crust", @@ -142,8 +142,8 @@ "toggleButton.off.focusBorder": "Transparent", "toggleButton.off.background.default": "Surface0", "toggleButton.off.background.disabled": "Overlay0", - "toggleButton.off.background.hovered": "363a4f60%", - "toggleButton.off.background.pressed": "363a4f40%", + "toggleButton.off.background.hovered": "#363a4f99", + "toggleButton.off.background.pressed": "#363a4f66", "toggleButton.off.text.default": "Text", "toggleButton.off.text.hovered": "Text", "toggleButton.off.text.pressed": "Text", @@ -210,8 +210,8 @@ "editor.text": "Text", "editor.caret.background": "Text", "editor.whitespace.text": "Text", - "editor.currentLine.background.default": "6e738d10%", - "editor.currentLine.background.focused": "6e738d10%", + "editor.currentLine.background.default": "#6e738d1a", + "editor.currentLine.background.focused": "#6e738d1a", "editor.lineNumber.current": "Mauve", "editor.lineNumber.default": "Overlay0", "editor.gitDiff.background.added": "Green", @@ -251,11 +251,9 @@ "completion.match.background": "Transparent", "completion.match.text": "Flamingo", - "search.match.background": "eed49f80%", + "search.match.background": "#eed49fcc", "search.match.text": "Crust", - "dnd": "ffffff20%", - "icon.background.blue": "Blue", "icon.background.green": "Green", "icon.background.orange": "Peach", @@ -307,10 +305,10 @@ "progressBar.indeterminate.foreground": "Pink", "progressBar.indeterminate.foregroundAccent": "Mauve", - "scrollbar.thumb.default": "ffffff20%", - "scrollbar.thumb.hovered": "ffffff40%", + "scrollbar.thumb.default": "#ffffff33", + "scrollbar.thumb.hovered": "#ffffff66", "scrollbar.track.default": "Transparent", - "scrollbar.track.hovered": "ffffff20%", + "scrollbar.track.hovered": "#ffffff33", "tab.background.default": "Mantle", "tab.background.selected": "Surface0", @@ -380,23 +378,23 @@ "settings.modified.indicator": "Yellow", - "dragAndDrop.background": "ffffff10%", + "dragAndDrop.background": "#ffffff1A", "problemsWidget.checkmark.foreground": "Green", - "problemsWidget.checkmark.background": "a6da9530%", - "problemsWidget.status.expanded.background.error": "b11b31", - "problemsWidget.status.expanded.background.warning": "c38e23", - "problemsWidget.status.expanded.background.weakWarning": "573f0f", + "problemsWidget.checkmark.background": "#a6da954d", + "problemsWidget.status.expanded.background.error": "#b11b31", + "problemsWidget.status.expanded.background.warning": "#c38e23", + "problemsWidget.status.expanded.background.weakWarning": "#573f0f", - "problemsWidget.status.expanded.border.error": "de223e", - "problemsWidget.status.expanded.border.warning": "c38e23", - "problemsWidget.status.expanded.border.weakWarning": "d99e27", + "problemsWidget.status.expanded.border.error": "#de223e", + "problemsWidget.status.expanded.border.warning": "#c38e23", + "problemsWidget.status.expanded.border.weakWarning": "#d99e27", "gitBranchTag.local.text": "Text", - "gitBranchTag.local.background": "8aadf410%", + "gitBranchTag.local.background": "#8aadf41a", "gitBranchTag.local.border": "Blue", "gitBranchTag.remote.text": "Text", - "gitBranchTag.remote.background": "c6a0f610%", + "gitBranchTag.remote.background": "#c6a0f61a", "gitBranchTag.remote.border": "Mauve", "remoteWorkspaceStatusLabel.background.ssh": "Green", @@ -408,16 +406,16 @@ "remoteWorkspaceStatusLabel.text.docker": "Crust", "remoteWorkspaceStatusLabel.text.space": "Crust", - "remote.userColor.background.one": "f4dbd670%", - "remote.userColor.background.two": "f5bde670%", - "remote.userColor.background.three": "b7bdf870%", - "remote.userColor.background.four": "c6a0f670%", - "remote.userColor.background.five": "ee99a070%", - "remote.userColor.background.six": "f5a97f70%", - "remote.userColor.background.seven": "eed49f70%", - "remote.userColor.background.eight": "a6da9570%", - "remote.userColor.background.nine": "8bd5ca70%", - "remote.userColor.background.ten": "8aadf470%", + "remote.userColor.background.one": "#f4dbd6b3", + "remote.userColor.background.two": "#f5bde6b3", + "remote.userColor.background.three": "#b7bdf8b3", + "remote.userColor.background.four": "#c6a0f6b3", + "remote.userColor.background.five": "#ee99a0b3", + "remote.userColor.background.six": "#f5a97fb3", + "remote.userColor.background.seven": "#eed49fb3", + "remote.userColor.background.eight": "#a6da95b3", + "remote.userColor.background.nine": "#8bd5cab3", + "remote.userColor.background.ten": "#8aadf4b3", "ai.inputField.background.default": "Mantle", "ai.inputField.border.default": "Transparent", @@ -432,8 +430,8 @@ "ai.button.default.focusOutline": "Transparent", "ai.button.default.background.default": "Surface0", "ai.button.default.background.disabled": "Surface0", - "ai.button.default.background.hovered": "363a4f60%", - "ai.button.default.background.pressed": "363a4f40%", + "ai.button.default.background.hovered": "#363a4f99", + "ai.button.default.background.pressed": "#363a4f66", "ai.button.default.text.default": "Text", "ai.button.default.text.disabled": "Surface2", "ai.button.default.text.hovered": "Text", @@ -447,8 +445,8 @@ "ai.button.recipe.focusOutline": "Transparent", "ai.button.recipe.background.default": "Surface0", "ai.button.recipe.background.disabled": "Surface0", - "ai.button.recipe.background.hovered": "363a4f60%", - "ai.button.recipe.background.pressed": "363a4f40%", + "ai.button.recipe.background.hovered": "#363a4f99", + "ai.button.recipe.background.pressed": "#363a4f66", "ai.button.recipe.text.default": "Text", "ai.button.recipe.text.disabled": "Surface2", "ai.button.recipe.text.hovered": "Text", @@ -460,11 +458,11 @@ "ai.icon.text": "Mauve", "ai.icon.background": "Mauve", - "ai.icon.background.secondary": "c6a0f620%", + "ai.icon.background.secondary": "#c6a0f633", "ai.user.icon.text": "Blue", "ai.user.icon.background": "Blue", - "ai.user.icon.background.secondary": "8aadf420%", + "ai.user.icon.background.secondary": "#8aadf433", "ai.error.border": "Red", "ai.error.fill": "Transparent" @@ -498,62 +496,64 @@ "backgroundColor": "Blue" }, "diff.added": { - "backgroundColor": "a6da9520%", - "stripeColor": "a6da9520%" + "backgroundColor": "#586e5f" }, - "diff.added.empty": { - "backgroundColor": "a6da9520%", - "showEmptyIntervals": true + "diff.added.word": { + "backgroundColor": "#586e5f" }, "diff.added.withBorder": { - "backgroundColor": "a6da9520%", - "decoration": { - "color": "a6da9520%", - "style": "BORDER" + "backgroundColor": "#586e5f", + "border": { + "color": "Green" } }, - "diff.added.word": { - "backgroundColor": "a6da9520%" - }, - "diff.conflict.withBorder": { - "backgroundColor": "ed879630%", - "decoration": { - "color": "Red", - "style": "BORDER" + "diff.added.resolved": { + "backgroundColor": "Transparent", + "border": { + "color": "Green" } }, + "diff.added.empty": { + "backgroundColor": "#586e5f" + }, "diff.deleted": { - "backgroundColor": "ed879620%", - "stripeColor": "ed879620%" + "backgroundColor": "#6c495b" }, - "diff.deleted.empty": { - "backgroundColor": "ed879620%", - "showEmptyIntervals": true + "diff.deleted.word": { + "backgroundColor": "#6c495b" }, "diff.deleted.withBorder": { - "backgroundColor": "ed879620%", - "decoration": { - "color": "ed879620%", - "style": "BORDER" + "backgroundColor": "#6c495b", + "border": { + "color": "Red" } }, - "diff.deleted.word": { - "backgroundColor": "ed879620%", - "showEmptyIntervals": true + "diff.deleted.resolved": { + "backgroundColor": "Transparent", + "border": { + "color": "Red" + } + }, + "diff.deleted.empty": { + "backgroundColor": "#6c495b" }, "diff.modified": { - "backgroundColor": "8aadf420%", - "stripeColor": "8aadf420%" + "backgroundColor": "#4a587d" + }, + "diff.modified.word": { + "backgroundColor": "#5673a7" }, "diff.modified.withBorder": { - "backgroundColor": "8aadf420%", - "decoration": { - "color": "8aadf420%", - "style": "BORDER" + "backgroundColor": "#4a587d", + "border": { + "color": "Blue" } }, - "diff.modified.word": { - "backgroundColor": "8aadf420%" + "diff.modified.resolved": { + "backgroundColor": "Transparent", + "border": { + "color": "Blue" + } }, "editor.brace.match": { "backgroundColor": "Surface1" @@ -571,7 +571,7 @@ "stripeColor": "Surface0" }, "editor.search.results": { - "backgroundColor": "8aadf440%", + "backgroundColor": "#8aadf466", "stripeColor": "Blue" }, "editor.selection": { @@ -816,10 +816,10 @@ }, "problem.info": { "decoration": { - "color": "8bd5ca40%", + "color": "#8bd5ca66", "style": "BORDER" }, - "stripeColor": "8bd5ca40%" + "stripeColor": "#8bd5ca66" }, "problem.unknown": {}, "problem.unused": { @@ -834,10 +834,10 @@ }, "problem.warning.weak": { "decoration": { - "color": "eed49f40%", + "color": "#eed49f66", "thickness": 2.0 }, - "stripeColor": "eed49f40%" + "stripeColor": "#eed49f66" }, "propertyName.css": { "foregroundColor": "Blue" @@ -873,9 +873,14 @@ "foregroundColor": "Mauve" }, "snippet": { - "backgroundColor": "Blue", - "borderRadius": 4.0, - "showEmptyIntervals": true + "border": { + "color": "Surface1" + } + }, + "snippet.selected": { + "border": { + "color": "Blue" + } }, "string": { "foregroundColor": "Green" @@ -919,32 +924,32 @@ } }, "palette": { - "Rosewater": "f4dbd6", - "Flamingo": "f0c6c6", - "Pink": "f5bde6", - "Mauve": "c6a0f6", - "Red": "ed8796", - "Maroon": "ee99a0", - "Peach": "f5a97f", - "Yellow": "eed49f", - "Green": "a6da95", - "Teal": "8bd5ca", - "Sky": "91d7e3", - "Sapphire": "7dc4e4", - "Blue": "8aadf4", - "Lavender": "b7bdf8", - "Text": "cad3f5", - "Subtext1": "b8c0e0", - "Subtext0": "a5adcb", - "Overlay2": "939ab7", - "Overlay1": "8087a2", - "Overlay0": "6e738d", - "Surface2": "5b6078", - "Surface1": "494d64", - "Surface0": "363a4f", - "Base": "24273a", - "Mantle": "1e2030", - "Crust": "181926", - "Transparent": "ffffff0%" + "Rosewater": "#f4dbd6", + "Flamingo": "#f0c6c6", + "Pink": "#f5bde6", + "Mauve": "#c6a0f6", + "Red": "#ed8796", + "Maroon": "#ee99a0", + "Peach": "#f5a97f", + "Yellow": "#eed49f", + "Green": "#a6da95", + "Teal": "#8bd5ca", + "Sky": "#91d7e3", + "Sapphire": "#7dc4e4", + "Blue": "#8aadf4", + "Lavender": "#b7bdf8", + "Text": "#cad3f5", + "Subtext1": "#b8c0e0", + "Subtext0": "#a5adcb", + "Overlay2": "#939ab7", + "Overlay1": "#8087a2", + "Overlay0": "#6e738d", + "Surface2": "#5b6078", + "Surface1": "#494d64", + "Surface0": "#363a4f", + "Base": "#24273a", + "Mantle": "#1e2030", + "Crust": "#181926", + "Transparent": "#ffffff00" } } diff --git a/catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-mocha.json b/catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-mocha.json index 0d0ab12..f0f397a 100644 --- a/catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-mocha.json +++ b/catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-mocha.json @@ -41,8 +41,8 @@ "button.primary.focusOutline": "Transparent", "button.primary.background.default": "Mauve", "button.primary.background.disabled": "Overlay1", - "button.primary.background.hovered": "cba6f770%", - "button.primary.background.pressed": "cba6f760%", + "button.primary.background.hovered": "#cba6f7cc", + "button.primary.background.pressed": "#cba6f799", "button.primary.text.default": "Crust", "button.primary.text.disabled": "Subtext0", "button.primary.text.hovered": "Crust", @@ -56,8 +56,8 @@ "button.secondary.focusOutline": "Transparent", "button.secondary.background.default": "Surface0", "button.secondary.background.disabled": "Surface0", - "button.secondary.background.hovered": "31324460%", - "button.secondary.background.pressed": "31324440%", + "button.secondary.background.hovered": "#31324499", + "button.secondary.background.pressed": "#31324466", "button.secondary.text.default": "Text", "button.secondary.text.disabled": "Surface2", "button.secondary.text.hovered": "Text", @@ -70,9 +70,9 @@ "button.positive.focusBorder": "Transparent", "button.positive.focusOutline": "Transparent", "button.positive.background.default": "Green", - "button.positive.background.disabled": "a6e3a140%", - "button.positive.background.hovered": "a6e3a170%", - "button.positive.background.pressed": "a6e3a160%", + "button.positive.background.disabled": "#a6e3a166", + "button.positive.background.hovered": "#a6e3a1b3", + "button.positive.background.pressed": "#a6e3a199", "button.positive.text.default": "Crust", "button.positive.text.disabled": "Subtext0", "button.positive.text.hovered": "Crust", @@ -85,9 +85,9 @@ "button.dangerous.focusBorder": "Transparent", "button.dangerous.focusOutline": "Transparent", "button.dangerous.background.default": "Red", - "button.dangerous.background.disabled": "f38ba840%", - "button.dangerous.background.hovered": "f38ba870%", - "button.dangerous.background.pressed": "f38ba860%", + "button.dangerous.background.disabled": "#f38ba866", + "button.dangerous.background.hovered": "#f38ba8b3", + "button.dangerous.background.pressed": "#f38ba899", "button.dangerous.text.default": "Crust", "button.dangerous.text.disabled": "Subtext0", "button.dangerous.text.hovered": "Crust", @@ -101,8 +101,8 @@ "button.tile.focusOutline": "Transparent", "button.tile.background.default": "Mantle", "button.tile.background.disabled": "Mantle", - "button.tile.background.hovered": "31324460%", - "button.tile.background.pressed": "31324440%", + "button.tile.background.hovered": "#31324499", + "button.tile.background.pressed": "#31324466", "button.tile.text.default": "Text", "button.tile.text.disabled": "Surface2", "button.tile.text.hovered": "Text", @@ -131,8 +131,8 @@ "toggleButton.on.focusBorder": "Transparent", "toggleButton.on.background.default": "Lavender", "toggleButton.on.background.disabled": "Overlay0", - "toggleButton.on.background.hovered": "b4befe70%", - "toggleButton.on.background.pressed": "b4befe60%", + "toggleButton.on.background.hovered": "#b4befeb3", + "toggleButton.on.background.pressed": "#b4befe99", "toggleButton.on.text.default": "Crust", "toggleButton.on.text.hovered": "Crust", "toggleButton.on.text.pressed": "Crust", @@ -142,8 +142,8 @@ "toggleButton.off.focusBorder": "Transparent", "toggleButton.off.background.default": "Surface0", "toggleButton.off.background.disabled": "Overlay0", - "toggleButton.off.background.hovered": "31324460%", - "toggleButton.off.background.pressed": "31324440%", + "toggleButton.off.background.hovered": "#31324499", + "toggleButton.off.background.pressed": "#31324466", "toggleButton.off.text.default": "Text", "toggleButton.off.text.hovered": "Text", "toggleButton.off.text.pressed": "Text", @@ -210,8 +210,8 @@ "editor.text": "Text", "editor.caret.background": "Text", "editor.whitespace.text": "Text", - "editor.currentLine.background.default": "6c708610%", - "editor.currentLine.background.focused": "6c708610%", + "editor.currentLine.background.default": "#6c70861a", + "editor.currentLine.background.focused": "#6c70861a", "editor.lineNumber.current": "Mauve", "editor.lineNumber.default": "Overlay0", "editor.gitDiff.background.added": "Green", @@ -251,11 +251,9 @@ "completion.match.background": "Transparent", "completion.match.text": "Flamingo", - "search.match.background": "f9e2af80%", + "search.match.background": "#f9e2afcc", "search.match.text": "Crust", - "dnd": "ffffff20%", - "icon.background.blue": "Blue", "icon.background.green": "Green", "icon.background.orange": "Peach", @@ -307,10 +305,10 @@ "progressBar.indeterminate.foreground": "Pink", "progressBar.indeterminate.foregroundAccent": "Mauve", - "scrollbar.thumb.default": "ffffff20%", - "scrollbar.thumb.hovered": "ffffff40%", + "scrollbar.thumb.default": "#ffffff33", + "scrollbar.thumb.hovered": "#ffffff66", "scrollbar.track.default": "Transparent", - "scrollbar.track.hovered": "ffffff20%", + "scrollbar.track.hovered": "#ffffff33", "tab.background.default": "Mantle", "tab.background.selected": "Surface0", @@ -380,23 +378,23 @@ "settings.modified.indicator": "Yellow", - "dragAndDrop.background": "ffffff10%", + "dragAndDrop.background": "#ffffff1A", "problemsWidget.checkmark.foreground": "Green", - "problemsWidget.checkmark.background": "a6e3a130%", - "problemsWidget.status.expanded.background.error": "b91342", - "problemsWidget.status.expanded.background.warning": "d69710", - "problemsWidget.status.expanded.background.weakWarning": "5f4307", + "problemsWidget.checkmark.background": "#a6e3a14d", + "problemsWidget.status.expanded.background.error": "#b91342", + "problemsWidget.status.expanded.background.warning": "#d69710", + "problemsWidget.status.expanded.background.weakWarning": "#5f4307", - "problemsWidget.status.expanded.border.error": "e71953", - "problemsWidget.status.expanded.border.warning": "d69710", - "problemsWidget.status.expanded.border.weakWarning": "eda813", + "problemsWidget.status.expanded.border.error": "#e71953", + "problemsWidget.status.expanded.border.warning": "#d69710", + "problemsWidget.status.expanded.border.weakWarning": "#eda813", "gitBranchTag.local.text": "Text", - "gitBranchTag.local.background": "89b4fa10%", + "gitBranchTag.local.background": "#89b4fa1a", "gitBranchTag.local.border": "Blue", "gitBranchTag.remote.text": "Text", - "gitBranchTag.remote.background": "cba6f710%", + "gitBranchTag.remote.background": "#cba6f71a", "gitBranchTag.remote.border": "Mauve", "remoteWorkspaceStatusLabel.background.ssh": "Green", @@ -408,16 +406,16 @@ "remoteWorkspaceStatusLabel.text.docker": "Crust", "remoteWorkspaceStatusLabel.text.space": "Crust", - "remote.userColor.background.one": "f5e0dc70%", - "remote.userColor.background.two": "f5c2e770%", - "remote.userColor.background.three": "b4befe70%", - "remote.userColor.background.four": "cba6f770%", - "remote.userColor.background.five": "eba0ac70%", - "remote.userColor.background.six": "fab38770%", - "remote.userColor.background.seven": "f9e2af70%", - "remote.userColor.background.eight": "a6e3a170%", - "remote.userColor.background.nine": "94e2d570%", - "remote.userColor.background.ten": "89b4fa70%", + "remote.userColor.background.one": "#f5e0dcb3", + "remote.userColor.background.two": "#f5c2e7b3", + "remote.userColor.background.three": "#b4befeb3", + "remote.userColor.background.four": "#cba6f7b3", + "remote.userColor.background.five": "#eba0acb3", + "remote.userColor.background.six": "#fab387b3", + "remote.userColor.background.seven": "#f9e2afb3", + "remote.userColor.background.eight": "#a6e3a1b3", + "remote.userColor.background.nine": "#94e2d5b3", + "remote.userColor.background.ten": "#89b4fab3", "ai.inputField.background.default": "Mantle", "ai.inputField.border.default": "Transparent", @@ -432,8 +430,8 @@ "ai.button.default.focusOutline": "Transparent", "ai.button.default.background.default": "Surface0", "ai.button.default.background.disabled": "Surface0", - "ai.button.default.background.hovered": "31324460%", - "ai.button.default.background.pressed": "31324440%", + "ai.button.default.background.hovered": "#31324499", + "ai.button.default.background.pressed": "#31324466", "ai.button.default.text.default": "Text", "ai.button.default.text.disabled": "Surface2", "ai.button.default.text.hovered": "Text", @@ -447,8 +445,8 @@ "ai.button.recipe.focusOutline": "Transparent", "ai.button.recipe.background.default": "Surface0", "ai.button.recipe.background.disabled": "Surface0", - "ai.button.recipe.background.hovered": "31324460%", - "ai.button.recipe.background.pressed": "31324440%", + "ai.button.recipe.background.hovered": "#31324499", + "ai.button.recipe.background.pressed": "#31324466", "ai.button.recipe.text.default": "Text", "ai.button.recipe.text.disabled": "Surface2", "ai.button.recipe.text.hovered": "Text", @@ -460,11 +458,11 @@ "ai.icon.text": "Mauve", "ai.icon.background": "Mauve", - "ai.icon.background.secondary": "cba6f720%", + "ai.icon.background.secondary": "#cba6f733", "ai.user.icon.text": "Blue", "ai.user.icon.background": "Blue", - "ai.user.icon.background.secondary": "89b4fa20%", + "ai.user.icon.background.secondary": "#89b4fa33", "ai.error.border": "Red", "ai.error.fill": "Transparent" @@ -498,62 +496,64 @@ "backgroundColor": "Blue" }, "diff.added": { - "backgroundColor": "a6e3a120%", - "stripeColor": "a6e3a120%" + "backgroundColor": "#586e5f" }, - "diff.added.empty": { - "backgroundColor": "a6e3a120%", - "showEmptyIntervals": true + "diff.added.word": { + "backgroundColor": "#586e5f" }, "diff.added.withBorder": { - "backgroundColor": "a6e3a120%", - "decoration": { - "color": "a6e3a120%", - "style": "BORDER" + "backgroundColor": "#586e5f", + "border": { + "color": "Green" } }, - "diff.added.word": { - "backgroundColor": "a6e3a120%" - }, - "diff.conflict.withBorder": { - "backgroundColor": "f38ba830%", - "decoration": { - "color": "Red", - "style": "BORDER" + "diff.added.resolved": { + "backgroundColor": "Transparent", + "border": { + "color": "Green" } }, + "diff.added.empty": { + "backgroundColor": "#586e5f" + }, "diff.deleted": { - "backgroundColor": "f38ba820%", - "stripeColor": "f38ba820%" + "backgroundColor": "#6c495b" }, - "diff.deleted.empty": { - "backgroundColor": "f38ba820%", - "showEmptyIntervals": true + "diff.deleted.word": { + "backgroundColor": "#6c495b" }, "diff.deleted.withBorder": { - "backgroundColor": "f38ba820%", - "decoration": { - "color": "f38ba820%", - "style": "BORDER" + "backgroundColor": "#6c495b", + "border": { + "color": "Red" } }, - "diff.deleted.word": { - "backgroundColor": "f38ba820%", - "showEmptyIntervals": true + "diff.deleted.resolved": { + "backgroundColor": "Transparent", + "border": { + "color": "Red" + } + }, + "diff.deleted.empty": { + "backgroundColor": "#6c495b" }, "diff.modified": { - "backgroundColor": "89b4fa20%", - "stripeColor": "89b4fa20%" + "backgroundColor": "#4a587d" + }, + "diff.modified.word": { + "backgroundColor": "#5673a7" }, "diff.modified.withBorder": { - "backgroundColor": "89b4fa20%", - "decoration": { - "color": "89b4fa20%", - "style": "BORDER" + "backgroundColor": "#4a587d", + "border": { + "color": "Blue" } }, - "diff.modified.word": { - "backgroundColor": "89b4fa20%" + "diff.modified.resolved": { + "backgroundColor": "Transparent", + "border": { + "color": "Blue" + } }, "editor.brace.match": { "backgroundColor": "Surface1" @@ -571,7 +571,7 @@ "stripeColor": "Surface0" }, "editor.search.results": { - "backgroundColor": "89b4fa40%", + "backgroundColor": "#89b4fa66", "stripeColor": "Blue" }, "editor.selection": { @@ -816,10 +816,10 @@ }, "problem.info": { "decoration": { - "color": "94e2d540%", + "color": "#94e2d566", "style": "BORDER" }, - "stripeColor": "94e2d540%" + "stripeColor": "#94e2d566" }, "problem.unknown": {}, "problem.unused": { @@ -834,10 +834,10 @@ }, "problem.warning.weak": { "decoration": { - "color": "f9e2af40%", + "color": "#f9e2af66", "thickness": 2.0 }, - "stripeColor": "f9e2af40%" + "stripeColor": "#f9e2af66" }, "propertyName.css": { "foregroundColor": "Blue" @@ -873,9 +873,14 @@ "foregroundColor": "Mauve" }, "snippet": { - "backgroundColor": "Blue", - "borderRadius": 4.0, - "showEmptyIntervals": true + "border": { + "color": "Surface1" + } + }, + "snippet.selected": { + "border": { + "color": "Blue" + } }, "string": { "foregroundColor": "Green" @@ -919,32 +924,32 @@ } }, "palette": { - "Rosewater": "f5e0dc", - "Flamingo": "f2cdcd", - "Pink": "f5c2e7", - "Mauve": "cba6f7", - "Red": "f38ba8", - "Maroon": "eba0ac", - "Peach": "fab387", - "Yellow": "f9e2af", - "Green": "a6e3a1", - "Teal": "94e2d5", - "Sky": "89dceb", - "Sapphire": "74c7ec", - "Blue": "89b4fa", - "Lavender": "b4befe", - "Text": "cdd6f4", - "Subtext1": "bac2de", - "Subtext0": "a6adc8", - "Overlay2": "9399b2", - "Overlay1": "7f849c", - "Overlay0": "6c7086", - "Surface2": "585b70", - "Surface1": "45475a", - "Surface0": "313244", - "Base": "1e1e2e", - "Mantle": "181825", - "Crust": "11111b", - "Transparent": "ffffff0%" + "Rosewater": "#f5e0dc", + "Flamingo": "#f2cdcd", + "Pink": "#f5c2e7", + "Mauve": "#cba6f7", + "Red": "#f38ba8", + "Maroon": "#eba0ac", + "Peach": "#fab387", + "Yellow": "#f9e2af", + "Green": "#a6e3a1", + "Teal": "#94e2d5", + "Sky": "#89dceb", + "Sapphire": "#74c7ec", + "Blue": "#89b4fa", + "Lavender": "#b4befe", + "Text": "#cdd6f4", + "Subtext1": "#bac2de", + "Subtext0": "#a6adc8", + "Overlay2": "#9399b2", + "Overlay1": "#7f849c", + "Overlay0": "#6c7086", + "Surface2": "#585b70", + "Surface1": "#45475a", + "Surface0": "#313244", + "Base": "#1e1e2e", + "Mantle": "#181825", + "Crust": "#11111b", + "Transparent": "#ffffff00" } } diff --git a/fleet.tera b/fleet.tera index 462de2f..5252cbf 100644 --- a/fleet.tera +++ b/fleet.tera @@ -2,21 +2,28 @@ accent: mauve whiskers: version: 2.4.0 + hex_format: "#{{r}}{{g}}{{b}}{{z}}" matrix: - flavor filename: "catppuccin-theme/frontendImpl/src/jvmMain/resources/catppuccin-{{ flavor.identifier }}.json" --- +{#- +Fleet doesn't deal well with transparent colours for diff, so we need to colour pick them +and set them without the transparency value. +-#} {%- if flavor.dark -%} -{%- set transparent = "ffffff" -%} -{%- set diff_added_opacity = "20%" -%} -{%- set diff_conflict_opacity = "30%" -%} -{%- set diff_deleted_opacity = "20%" -%} +{%- set transparent = "#ffffff" -%} +{%- set diff_green = "#586e5f" -%} +{%- set diff_red = "#6c495b" -%} +{%- set diff_blue_bg = "#4a587d" -%} +{%- set diff_blue_fg = "#5673a7" -%} {%- else -%} -{%- set transparent = "000000" -%} -{%- set diff_added_opacity = "20%" -%} -{%- set diff_conflict_opacity = "20%" -%} -{%- set diff_deleted_opacity = "10%" -%} +{%- set transparent = "#000000" -%} +{%- set diff_green = "#cce1cd" -%} +{%- set diff_red = "#e9c4cf" -%} +{%- set diff_blue_bg = "#c7d6f7" -%} +{%- set diff_blue_fg = "#97b6f8" -%} {%- endif -%} { @@ -62,8 +69,8 @@ whiskers: "button.primary.focusOutline": "Transparent", "button.primary.background.default": "Mauve", "button.primary.background.disabled": "Overlay1", - "button.primary.background.hovered": "{{ mauve.hex }}70%", - "button.primary.background.pressed": "{{ mauve.hex }}60%", + "button.primary.background.hovered": "{{ mauve | mod(opacity=0.8) | get(key="hex") }}", + "button.primary.background.pressed": "{{ mauve | mod(opacity=0.6) | get(key="hex") }}", "button.primary.text.default": "Crust", "button.primary.text.disabled": "Subtext0", "button.primary.text.hovered": "Crust", @@ -77,8 +84,8 @@ whiskers: "button.secondary.focusOutline": "Transparent", "button.secondary.background.default": "Surface0", "button.secondary.background.disabled": "Surface0", - "button.secondary.background.hovered": "{{ surface0.hex }}60%", - "button.secondary.background.pressed": "{{ surface0.hex }}40%", + "button.secondary.background.hovered": "{{ surface0 | mod(opacity=0.6) | get(key="hex") }}", + "button.secondary.background.pressed": "{{ surface0 | mod(opacity=0.4) | get(key="hex") }}", "button.secondary.text.default": "Text", "button.secondary.text.disabled": "Surface2", "button.secondary.text.hovered": "Text", @@ -91,9 +98,9 @@ whiskers: "button.positive.focusBorder": "Transparent", "button.positive.focusOutline": "Transparent", "button.positive.background.default": "Green", - "button.positive.background.disabled": "{{ green.hex }}40%", - "button.positive.background.hovered": "{{ green.hex }}70%", - "button.positive.background.pressed": "{{ green.hex }}60%", + "button.positive.background.disabled": "{{ green | mod(opacity=0.4) | get(key="hex") }}", + "button.positive.background.hovered": "{{ green | mod(opacity=0.7) | get(key="hex") }}", + "button.positive.background.pressed": "{{ green | mod(opacity=0.6) | get(key="hex") }}", "button.positive.text.default": "Crust", "button.positive.text.disabled": "Subtext0", "button.positive.text.hovered": "Crust", @@ -106,9 +113,9 @@ whiskers: "button.dangerous.focusBorder": "Transparent", "button.dangerous.focusOutline": "Transparent", "button.dangerous.background.default": "Red", - "button.dangerous.background.disabled": "{{ red.hex }}40%", - "button.dangerous.background.hovered": "{{ red.hex }}70%", - "button.dangerous.background.pressed": "{{ red.hex }}60%", + "button.dangerous.background.disabled": "{{ red | mod(opacity=0.4) | get(key="hex") }}", + "button.dangerous.background.hovered": "{{ red | mod(opacity=0.7) | get(key="hex") }}", + "button.dangerous.background.pressed": "{{ red | mod(opacity=0.6) | get(key="hex") }}", "button.dangerous.text.default": "Crust", "button.dangerous.text.disabled": "Subtext0", "button.dangerous.text.hovered": "Crust", @@ -122,8 +129,8 @@ whiskers: "button.tile.focusOutline": "Transparent", "button.tile.background.default": "Mantle", "button.tile.background.disabled": "Mantle", - "button.tile.background.hovered": "{{ surface0.hex }}60%", - "button.tile.background.pressed": "{{ surface0.hex }}40%", + "button.tile.background.hovered": "{{ surface0 | mod(opacity=0.6) | get(key="hex") }}", + "button.tile.background.pressed": "{{ surface0 | mod(opacity=0.4) | get(key="hex") }}", "button.tile.text.default": "Text", "button.tile.text.disabled": "Surface2", "button.tile.text.hovered": "Text", @@ -152,8 +159,8 @@ whiskers: "toggleButton.on.focusBorder": "Transparent", "toggleButton.on.background.default": "Lavender", "toggleButton.on.background.disabled": "Overlay0", - "toggleButton.on.background.hovered": "{{ lavender.hex }}70%", - "toggleButton.on.background.pressed": "{{ lavender.hex }}60%", + "toggleButton.on.background.hovered": "{{ lavender | mod(opacity=0.7) | get(key="hex") }}", + "toggleButton.on.background.pressed": "{{ lavender | mod(opacity=0.6) | get(key="hex") }}", "toggleButton.on.text.default": "Crust", "toggleButton.on.text.hovered": "Crust", "toggleButton.on.text.pressed": "Crust", @@ -163,8 +170,8 @@ whiskers: "toggleButton.off.focusBorder": "Transparent", "toggleButton.off.background.default": "Surface0", "toggleButton.off.background.disabled": "Overlay0", - "toggleButton.off.background.hovered": "{{ surface0.hex }}60%", - "toggleButton.off.background.pressed": "{{ surface0.hex }}40%", + "toggleButton.off.background.hovered": "{{ surface0 | mod(opacity=0.6) | get(key="hex") }}", + "toggleButton.off.background.pressed": "{{ surface0 | mod(opacity=0.4) | get(key="hex") }}", "toggleButton.off.text.default": "Text", "toggleButton.off.text.hovered": "Text", "toggleButton.off.text.pressed": "Text", @@ -231,8 +238,8 @@ whiskers: "editor.text": "Text", "editor.caret.background": "Text", "editor.whitespace.text": "Text", - "editor.currentLine.background.default": "{{ overlay0.hex }}10%", - "editor.currentLine.background.focused": "{{ overlay0.hex }}10%", + "editor.currentLine.background.default": "{{ overlay0 | mod(opacity=0.1) | get(key="hex") }}", + "editor.currentLine.background.focused": "{{ overlay0 | mod(opacity=0.1) | get(key="hex") }}", "editor.lineNumber.current": "Mauve", "editor.lineNumber.default": "Overlay0", "editor.gitDiff.background.added": "Green", @@ -272,11 +279,9 @@ whiskers: "completion.match.background": "Transparent", "completion.match.text": "Flamingo", - "search.match.background": "{{ yellow.hex }}80%", + "search.match.background": "{{ yellow | mod(opacity=0.8) | get(key="hex") }}", "search.match.text": "Crust", - "dnd": "{{ transparent }}20%", - "icon.background.blue": "Blue", "icon.background.green": "Green", "icon.background.orange": "Peach", @@ -328,10 +333,10 @@ whiskers: "progressBar.indeterminate.foreground": "Pink", "progressBar.indeterminate.foregroundAccent": "Mauve", - "scrollbar.thumb.default": "{{ transparent }}20%", - "scrollbar.thumb.hovered": "{{ transparent }}40%", + "scrollbar.thumb.default": "{{ transparent }}33", {#- 33 alpha -> 20% opacity #} + "scrollbar.thumb.hovered": "{{ transparent }}66", {#- 66 alpha -> 40% opacity #} "scrollbar.track.default": "Transparent", - "scrollbar.track.hovered": "{{ transparent }}20%", + "scrollbar.track.hovered": "{{ transparent }}33", {#- 33 alpha -> 20% opacity #} "tab.background.default": "Mantle", "tab.background.selected": "Surface0", @@ -407,10 +412,10 @@ whiskers: "settings.modified.indicator": "Yellow", - "dragAndDrop.background": "{{ transparent }}10%", + "dragAndDrop.background": "{{ transparent }}1A", {#- 1A alpha -> 10% opacity #} "problemsWidget.checkmark.foreground": "Green", - "problemsWidget.checkmark.background": "{{ green.hex }}30%", + "problemsWidget.checkmark.background": "{{ green | mod(opacity=0.3) | get(key="hex") }}", "problemsWidget.status.expanded.background.error": "{{ red | mod(lightness=40) | get(key="hex") }}", "problemsWidget.status.expanded.background.warning": "{{ yellow | mod(lightness=45) | get(key="hex") }}", {% if flavor.dark -%} @@ -423,10 +428,10 @@ whiskers: "problemsWidget.status.expanded.border.weakWarning": "{{ yellow | mod(lightness=50) | get(key="hex") }}", "gitBranchTag.local.text": "Text", - "gitBranchTag.local.background": "{{ blue.hex }}10%", + "gitBranchTag.local.background": "{{ blue | mod(opacity=0.1) | get(key="hex") }}", "gitBranchTag.local.border": "Blue", "gitBranchTag.remote.text": "Text", - "gitBranchTag.remote.background": "{{ mauve.hex }}10%", + "gitBranchTag.remote.background": "{{ mauve | mod(opacity=0.1) | get(key="hex") }}", "gitBranchTag.remote.border": "Mauve", "remoteWorkspaceStatusLabel.background.ssh": "Green", @@ -438,16 +443,16 @@ whiskers: "remoteWorkspaceStatusLabel.text.docker": "Crust", "remoteWorkspaceStatusLabel.text.space": "Crust", - "remote.userColor.background.one": "{{ rosewater.hex }}70%", - "remote.userColor.background.two": "{{ pink.hex }}70%", - "remote.userColor.background.three": "{{ lavender.hex }}70%", - "remote.userColor.background.four": "{{ mauve.hex }}70%", - "remote.userColor.background.five": "{{ maroon.hex }}70%", - "remote.userColor.background.six": "{{ peach.hex }}70%", - "remote.userColor.background.seven": "{{ yellow.hex }}70%", - "remote.userColor.background.eight": "{{ green.hex }}70%", - "remote.userColor.background.nine": "{{ teal.hex }}70%", - "remote.userColor.background.ten": "{{ blue.hex }}70%", + "remote.userColor.background.one": "{{ rosewater | mod(opacity=0.7) | get(key="hex") }}", + "remote.userColor.background.two": "{{ pink | mod(opacity=0.7) | get(key="hex") }}", + "remote.userColor.background.three": "{{ lavender | mod(opacity=0.7) | get(key="hex") }}", + "remote.userColor.background.four": "{{ mauve | mod(opacity=0.7) | get(key="hex") }}", + "remote.userColor.background.five": "{{ maroon | mod(opacity=0.7) | get(key="hex") }}", + "remote.userColor.background.six": "{{ peach | mod(opacity=0.7) | get(key="hex") }}", + "remote.userColor.background.seven": "{{ yellow | mod(opacity=0.7) | get(key="hex") }}", + "remote.userColor.background.eight": "{{ green | mod(opacity=0.7) | get(key="hex") }}", + "remote.userColor.background.nine": "{{ teal | mod(opacity=0.7) | get(key="hex") }}", + "remote.userColor.background.ten": "{{ blue | mod(opacity=0.7) | get(key="hex") }}", "ai.inputField.background.default": "Mantle", "ai.inputField.border.default": "Transparent", @@ -462,8 +467,8 @@ whiskers: "ai.button.default.focusOutline": "Transparent", "ai.button.default.background.default": "Surface0", "ai.button.default.background.disabled": "Surface0", - "ai.button.default.background.hovered": "{{ surface0.hex }}60%", - "ai.button.default.background.pressed": "{{ surface0.hex }}40%", + "ai.button.default.background.hovered": "{{ surface0 | mod(opacity=0.6) | get(key="hex") }}", + "ai.button.default.background.pressed": "{{ surface0 | mod(opacity=0.4) | get(key="hex") }}", "ai.button.default.text.default": "Text", "ai.button.default.text.disabled": "Surface2", "ai.button.default.text.hovered": "Text", @@ -477,8 +482,8 @@ whiskers: "ai.button.recipe.focusOutline": "Transparent", "ai.button.recipe.background.default": "Surface0", "ai.button.recipe.background.disabled": "Surface0", - "ai.button.recipe.background.hovered": "{{ surface0.hex }}60%", - "ai.button.recipe.background.pressed": "{{ surface0.hex }}40%", + "ai.button.recipe.background.hovered": "{{ surface0 | mod(opacity=0.6) | get(key="hex") }}", + "ai.button.recipe.background.pressed": "{{ surface0 | mod(opacity=0.4) | get(key="hex") }}", "ai.button.recipe.text.default": "Text", "ai.button.recipe.text.disabled": "Surface2", "ai.button.recipe.text.hovered": "Text", @@ -490,11 +495,11 @@ whiskers: "ai.icon.text": "Mauve", "ai.icon.background": "Mauve", - "ai.icon.background.secondary": "{{ mauve.hex }}20%", + "ai.icon.background.secondary": "{{ mauve | mod(opacity=0.2) | get(key="hex") }}", "ai.user.icon.text": "Blue", "ai.user.icon.background": "Blue", - "ai.user.icon.background.secondary": "{{ blue.hex }}20%", + "ai.user.icon.background.secondary": "{{ blue | mod(opacity=0.2) | get(key="hex") }}", "ai.error.border": "Red", "ai.error.fill": "Transparent" @@ -528,62 +533,64 @@ whiskers: "backgroundColor": "Blue" }, "diff.added": { - "backgroundColor": "{{ green.hex }}{{ diff_added_opacity }}", - "stripeColor": "{{ green.hex }}{{ diff_added_opacity }}" + "backgroundColor": "{{ diff_green }}" }, - "diff.added.empty": { - "backgroundColor": "{{ green.hex }}{{ diff_added_opacity }}", - "showEmptyIntervals": true + "diff.added.word": { + "backgroundColor": "{{ diff_green }}" }, "diff.added.withBorder": { - "backgroundColor": "{{ green.hex }}{{ diff_added_opacity }}", - "decoration": { - "color": "{{ green.hex }}{{ diff_added_opacity }}", - "style": "BORDER" + "backgroundColor": "{{ diff_green }}", + "border": { + "color": "Green" } }, - "diff.added.word": { - "backgroundColor": "{{ green.hex }}{{ diff_added_opacity }}" - }, - "diff.conflict.withBorder": { - "backgroundColor": "{{ red.hex }}{{ diff_conflict_opacity }}", - "decoration": { - "color": "Red", - "style": "BORDER" + "diff.added.resolved": { + "backgroundColor": "Transparent", + "border": { + "color": "Green" } }, + "diff.added.empty": { + "backgroundColor": "{{ diff_green }}" + }, "diff.deleted": { - "backgroundColor": "{{ red.hex }}{{ diff_deleted_opacity }}", - "stripeColor": "{{ red.hex }}{{ diff_deleted_opacity }}" + "backgroundColor": "{{ diff_red }}" }, - "diff.deleted.empty": { - "backgroundColor": "{{ red.hex }}{{ diff_deleted_opacity }}", - "showEmptyIntervals": true + "diff.deleted.word": { + "backgroundColor": "{{ diff_red }}" }, "diff.deleted.withBorder": { - "backgroundColor": "{{ red.hex }}{{ diff_deleted_opacity }}", - "decoration": { - "color": "{{ red.hex }}{{ diff_deleted_opacity }}", - "style": "BORDER" + "backgroundColor": "{{ diff_red }}", + "border": { + "color": "Red" } }, - "diff.deleted.word": { - "backgroundColor": "{{ red.hex }}{{ diff_deleted_opacity }}", - "showEmptyIntervals": true + "diff.deleted.resolved": { + "backgroundColor": "Transparent", + "border": { + "color": "Red" + } + }, + "diff.deleted.empty": { + "backgroundColor": "{{ diff_red }}" }, "diff.modified": { - "backgroundColor": "{{ blue.hex }}{{ diff_deleted_opacity }}", - "stripeColor": "{{ blue.hex }}{{ diff_deleted_opacity }}" + "backgroundColor": "{{ diff_blue_bg }}" + }, + "diff.modified.word": { + "backgroundColor": "{{ diff_blue_fg }}" }, "diff.modified.withBorder": { - "backgroundColor": "{{ blue.hex }}{{ diff_deleted_opacity }}", - "decoration": { - "color": "{{ blue.hex }}{{ diff_deleted_opacity }}", - "style": "BORDER" + "backgroundColor": "{{ diff_blue_bg }}", + "border": { + "color": "Blue" } }, - "diff.modified.word": { - "backgroundColor": "{{ blue.hex }}{{ diff_deleted_opacity }}" + "diff.modified.resolved": { + "backgroundColor": "Transparent", + "border": { + "color": "Blue" + } }, "editor.brace.match": { "backgroundColor": "Surface1" @@ -601,7 +608,7 @@ whiskers: "stripeColor": "Surface0" }, "editor.search.results": { - "backgroundColor": "{{ blue.hex }}40%", + "backgroundColor": "{{ blue | mod(opacity=0.4) | get(key="hex") }}", "stripeColor": "Blue" }, {#- No qualifier refers to unfocused #} @@ -847,10 +854,10 @@ whiskers: }, "problem.info": { "decoration": { - "color": "{{ teal.hex }}40%", + "color": "{{ teal | mod(opacity=0.4) | get(key="hex") }}", "style": "BORDER" }, - "stripeColor": "{{ teal.hex }}40%" + "stripeColor": "{{ teal | mod(opacity=0.4) | get(key="hex") }}" }, "problem.unknown": {}, "problem.unused": { @@ -865,10 +872,10 @@ whiskers: }, "problem.warning.weak": { "decoration": { - "color": "{{ yellow.hex }}40%", + "color": "{{ yellow | mod(opacity=0.4) | get(key="hex") }}", "thickness": 2.0 }, - "stripeColor": "{{ yellow.hex }}40%" + "stripeColor": "{{ yellow | mod(opacity=0.4) | get(key="hex") }}" }, "propertyName.css": { "foregroundColor": "Blue" @@ -904,9 +911,14 @@ whiskers: "foregroundColor": "Mauve" }, "snippet": { - "backgroundColor": "Blue", - "borderRadius": 4.0, - "showEmptyIntervals": true + "border": { + "color": "Surface1" + } + }, + "snippet.selected": { + "border": { + "color": "Blue" + } }, "string": { "foregroundColor": "Green" @@ -953,6 +965,6 @@ whiskers: {%- for _, color in flavor.colors %} "{{ color.identifier | capitalize }}": "{{ color.hex }}", {%- endfor %} - "Transparent": "ffffff0%" + "Transparent": "#ffffff00" } }