From 051cd786a43a84912413b526782adffa9698fcd9 Mon Sep 17 00:00:00 2001 From: not Date: Thu, 12 Jan 2023 18:29:05 -0500 Subject: [PATCH] =?UTF-8?q?Ros=C3=A9=20Pine=20theme:=20use=20official=20va?= =?UTF-8?q?riants=20(#5489)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- runtime/themes/rose_pine.toml | 251 ++++++++++++++++++++--------- runtime/themes/rose_pine_dawn.toml | 109 ++++--------- runtime/themes/rose_pine_moon.toml | 116 ++++--------- 3 files changed, 228 insertions(+), 248 deletions(-) diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml index ee1d6e39..3386fffb 100644 --- a/runtime/themes/rose_pine.toml +++ b/runtime/themes/rose_pine.toml @@ -1,90 +1,187 @@ -# Author: RayGervais -# Author: ChrisHa -# Diagnostics patch author: cor +# Author: Rosé Pine +# Upstream: https://github.com/rose-pine/helix +# Contributing: +# Please submit changes to https://github.com/rose-pine/helix. +# The Rosé Pine team will update Helix, including you as a co-author. "ui.background" = { bg = "base" } -"ui.menu" = { fg = "text", bg = "overlay" } -"ui.menu.selected" = { fg = "iris", bg = "surface" } -"ui.linenr" = {fg = "subtle" } -"ui.liner.selected" = "highlightOverlay" -"ui.selection" = { bg = "highlight" } -"comment" = "subtle" -"ui.cursorline" = { bg = "surface" } -"ui.statusline" = {fg = "foam", bg = "surface" } -"ui.statusline.insert" = {fg = "base", bg = "foam", modifiers = ["bold"]} -"ui.statusline.normal" = {fg = "base", bg = "rose", modifiers = ["bold"]} -"ui.statusline.select" = {fg = "base", bg = "iris", modifiers = ["bold"]} -"ui.statusline.inactive" = { fg = "iris", bg = "surface" } -"ui.cursor" = { fg = "rose", modifiers = ["reversed"] } -"ui.text" = { fg = "text" } -"ui.text.focus" = { fg = "foam", modifiers = ["bold"]} -"ui.text.info" = {fg = "pine", modifiers = ["bold"]} -"ui.virtual.whitespace" = "highlight" -"ui.virtual.ruler" = { bg = "surface" } -"operator" = "rose" -"variable" = "text" -"constant.numeric" = "iris" -"constant" = "gold" -"attribute" = "gold" -"type" = "foam" -"ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] } -"string" = "gold" -"constant.character.escape" = "subtle" -"function" = "rose" -"function.builtin" = "rose" -"function.method" = "foam" -"constructor" = "gold" -"special" = "gold" -"keyword" = "pine" -"label" = "iris" -"namespace" = "pine" +"ui.background.separator" = { bg = "base" } + +"ui.cursor" = { fg = "text", bg = "highlight_high" } +# "ui.cursor.select" = {} +"ui.cursor.match" = { fg = "text", bg = "highlight_med" } +"ui.cursor.primary" = { fg = "text", bg = "muted"} + +# "ui.gutter" = {} +# "ui.gutter.selected" = {} + +"ui.linenr" = { fg = "muted" } +"ui.linenr.selected" = { fg = "text" } + +"ui.statusline" = { fg = "subtle", bg = "surface" } +"ui.statusline.inactive" = { fg = "muted", bg = "surface" } +"ui.statusline.normal" = { fg = "rose", bg = "rose_10" } +"ui.statusline.insert" = { fg = "foam", bg = "foam_10" } +"ui.statusline.select" = { fg = "iris", bg = "iris_10" } +# "ui.statusline.separator" = {} + "ui.popup" = { bg = "surface" } "ui.popup.info" = { bg = "surface" } -"ui.window" = { bg = "base" } -"ui.help" = { bg = "overlay", fg = "foam" } -"diff.plus" = "foam" -"diff.delta" = "rose" -"diff.minus" = "love" +"ui.window" = { fg = "overlay", bg = "base" } +"ui.help" = { fg = "subtle", bg = "overlay" } + +"ui.text" = { fg = "text" } +# "ui.text.focus" = {} +"ui.text.info" = { fg = "subtle" } + +"ui.virtual.ruler" = { bg = "overlay" } +"ui.virtual.whitespace" = { fg = "highlight_low" } +"ui.virtual.indent-guide" = { fg = "muted" } + +"ui.menu" = { fg = "subtle", bg = "surface" } +"ui.menu.selected" = { fg = "text" } +"ui.menu.scroll" = { fg = "muted", bg = "highlight_med" } + +"ui.selection" = { bg = "overlay" } +"ui.selection.primary" = { bg = "highlight_med" } + +"ui.cursorline.primary" = { bg = "highlight_low" } +"ui.cursorline.secondary" = { bg = "surface" } + +"warning" = "gold" +"error" = "love" "info" = "foam" "hint" = "iris" "debug" = "rose" -"warning" = "gold" -"error" = "love" -"diagnostic.error" = { underline = { style = "curl", color = "love" } } -"diagnostic.warning" = { underline = { style = "curl", color = "gold" } } -"diagnostic.info" = { underline = { style = "curl", color = "foam" } } -"diagnostic.hint" = { underline = { style = "curl", color = "iris" } } +"diagnostic" = { underline = { color = "subtle", style = "curl" } } +"diagnostic.hint" = { underline = { color = "iris", style = "curl" } } +"diagnostic.info" = { underline = { color = "foam", style = "curl" } } +"diagnostic.warning" = { underline = { color = "gold", style = "curl" } } +"diagnostic.error" = { underline = { color = "love", style = "curl" } } + +"attribute" = "iris" + +"type" = "foam" +# "type.builtin" = "" + +"constructor" = "foam" + +"constant" = "foam" +"constant.builtin" = "rose" +# "constant.builtin.boolean" = "" +"constant.character" = "gold" +"constant.character.escape" = "pine" +"constant.numeric" = "gold" +# "constant.numeric.integer" = "" +# "constant.numeric.float" = "" + +"string" = "gold" +# "string.regexp" = "" +# "string.special" = "" +# "string.special.path" = "" +# "string.special.url" = "" +# "string.special.symbol" = "" + +"comment" = { fg = "muted", modifiers = ["italic"]} +# "comment.line" = "" +# "comment.block" = "" +# "comment.block.documenation" = "" + +"variable" = "text" +"variable.builtin" = "love" +"variable.parameter" = "iris" +# "variable.other" = "" +# "variable.other.member" = "" + +"label" = "foam" -"markup.heading.marker" = "subtle" -"markup.heading.1" = { fg = "love", modifiers = ["bold"] } -"markup.heading.2" = { fg = "gold", modifiers = ["bold"] } +"punctuation" = "subtle" +# "punctuation.delimiter" = "" +# "punctuation.bracket" = "" +# "punctuation.special" = "" + +"keyword" = "pine" +# "keyword.control" = "" +# "keyword.control.conditional" = "" +# "keyword.control.repeat" = "" +# "keyword.control.import" = "" +# "keyword.control.return" = "" +# "keyword.control.exception" = "" +"keyword.operator" = "subtle" +# "keyword.directive" = "" +# "keyword.function" = "" +# "keyword.storage" = "" +# "keyword.storage.type" = "" +# "keyword.storage.modifier" = "" + +"operator" = "subtle" + +"function" = "rose" # maybe pine +"function.builtin" = "love" +# "function.method" = "" +# "function.macro" = "" +# "function.special" = "" + +"tag" = "foam" + +"namespace" = "iris" + +"markup.heading.marker" = "muted" +"markup.heading" = { fg = "iris", modifiers = ["bold"] } +"markup.heading.1" = { fg = "iris", modifiers = ["bold"] } +"markup.heading.2" = { fg = "foam", modifiers = ["bold"] } "markup.heading.3" = { fg = "rose", modifiers = ["bold"] } -"markup.heading.4" = { fg = "pine", modifiers = ["bold"] } -"markup.heading.5" = { fg = "foam", modifiers = ["bold"] } -"markup.heading.6" = { fg = "iris", modifiers = ["bold"] } -"markup.list" = { fg = "love" } -"markup.bold" = { fg = "gold", modifiers = ["bold"] } -"markup.italic" = { fg = "iris", modifiers = ["italic"] } -"markup.link.url" = { fg = "pine", modifiers = ["underlined"]} -"markup.link.text" = { fg = "foam" } -"markup.quote" = { fg = "rose" } -"markup.raw" = { fg = "foam" } +"markup.heading.4" = { fg = "gold", modifiers = ["bold"] } +"markup.heading.5" = { fg = "pine", modifiers = ["bold"] } +"markup.heading.6" = { fg = "foam", modifiers = ["bold"] } +# "markup.heading.completion" = "" +# "markup.heading.hover" = "" +"markup.list" = "muted" +# "markup.list.unnumbered" = "" +# "markup.list.numbered" = "" +"markup.bold" = { modifiers = ["bold"] } +"markup.italic" = { modifiers = ["italic"] } +"markup.link" = "iris" +"markup.link.url" = { fg = "iris", underline = { color = "iris", style = "line" } } +"markup.link.label" = "subtle" +"markup.link.text" = "text" +"markup.quote" = "subtle" +"markup.raw" = "subtle" +# "markup.raw.inline" = {} +# "markup.raw.inline.completion" = {} +# "markup.raw.inline.hover" = {} +# "markup.raw.block" = {} +# "markup.normal" = "" +# "markup.normal.completion" = "" +# "markup.normal.hover" = "" + +"diff" = "overlay" +"diff.plus" = "foam" +"diff.minus" = "love" +"diff.delta" = "highlight_high" +# "diff.delta.moved" = "" [palette] -base = "#191724" -surface = "#1f1d2e" -overlay = "#26233a" -inactive = "#555169" -subtle = "#6e6a86" -text = "#e0def4" -love = "#eb6f92" -gold = "#f6c177" -rose = "#ebbcba" -pine = "#31748f" -foam = "#9ccfd8" -iris = "#c4a7e7" -highlight = "#403d52" -highlightInactive = "#21202e" -highlightOverlay = "#524f67" +base = "#191724" +surface = "#1f1d2e" +overlay = "#26233a" +muted = "#6e6a86" +subtle = "#908caa" +text = "#e0def4" +love = "#eb6f92" +love_10 = "#311f30" +gold = "#f6c177" +gold_10 = "#30282c" +rose = "#ebbcba" +rose_10 = "#2f2834" +pine = "#31748f" +pine_10 = "#1a2030" +foam = "#9ccfd8" +foam_10 = "#252937" +iris = "#c4a7e7" +iris_10 = "#2b2539" +highlight_low = "#21202e" +highlight_med = "#403d52" +highlight_high = "#524f67" \ No newline at end of file diff --git a/runtime/themes/rose_pine_dawn.toml b/runtime/themes/rose_pine_dawn.toml index d9377966..030ddccf 100644 --- a/runtime/themes/rose_pine_dawn.toml +++ b/runtime/themes/rose_pine_dawn.toml @@ -1,85 +1,30 @@ -# Author: RayGervais -# Author: ChrisHa +# Author: Rosé Pine +# Upstream: https://github.com/rose-pine/helix +# Contributing: +# Please submit changes to https://github.com/rose-pine/helix. +# The Rosé Pine team will update Helix, including you as a co-author. -"ui.background" = { bg = "surface" } -"ui.menu" = { fg = "text", bg = "overlay" } -"ui.menu.selected" = { fg = "iris", bg = "surface" } -"ui.linenr" = {fg = "subtle" } -"ui.liner.selected" = "highlightOverlay" -"ui.selection" = { bg = "highlight" } -"comment" = "subtle" -"ui.cursorline" = {bg = "base" } -"ui.statusline" = {fg = "foam", bg = "surface" } -"ui.statusline.inactive" = { fg = "iris", bg = "surface" } -"ui.cursor" = { fg = "rose", modifiers = ["reversed"] } -"ui.text" = { fg = "text" } -"ui.text.focus" = { fg = "foam", modifiers = ["bold"]} -"ui.text.info" = {fg = "pine", modifiers = ["bold"]} -"ui.virtual.whitespace" = "highlight" -"ui.virtual.ruler" = { bg = "base" } -"operator" = "rose" -"variable" = "text" -"number" = "iris" -"constant" = "gold" -"attribute" = "gold" -"type" = "foam" -"ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] } -"string" = "gold" -"escape" = "subtle" -"function" = "rose" -"function.builtin" = "rose" -"function.method" = "foam" -"constructor" = "gold" -"special" = "gold" -"keyword" = "pine" -"label" = "iris" -"namespace" = "pine" -"ui.popup" = { bg = "surface" } -"ui.popup.info" = { bg = "surface" } -"ui.window" = { bg = "base" } -"ui.help" = { bg = "overlay", fg = "foam" } -"diff.plus" = "foam" -"diff.delta" = "rose" -"diff.minus" = "love" - -"info" = "gold" -"hint" = "gold" -"debug" = "rose" -"error" = "love" - -"diagnostic.error" = { underline = { style = "curl", color = "love" } } -"diagnostic.warning" = { underline = { style = "curl", color = "gold" } } -"diagnostic.info" = { underline = { style = "curl", color = "foam" } } -"diagnostic.hint" = { underline = { style = "curl", color = "iris" } } - -"markup.heading.marker" = "subtle" -"markup.heading.1" = { fg = "love", modifiers = ["bold"] } -"markup.heading.2" = { fg = "gold", modifiers = ["bold"] } -"markup.heading.3" = { fg = "rose", modifiers = ["bold"] } -"markup.heading.4" = { fg = "pine", modifiers = ["bold"] } -"markup.heading.5" = { fg = "foam", modifiers = ["bold"] } -"markup.heading.6" = { fg = "iris", modifiers = ["bold"] } -"markup.list" = { fg = "love" } -"markup.bold" = { fg = "gold", modifiers = ["bold"] } -"markup.italic" = { fg = "iris", modifiers = ["italic"] } -"markup.link.url" = { fg = "pine", modifiers = ["underlined"]} -"markup.link.text" = { fg = "foam" } -"markup.quote" = { fg = "rose" } -"markup.raw" = { fg = "foam" } +inherits = "rose_pine" [palette] -base = "#faf4ed" -surface = "#fffaf3" -overlay = "#f2e9de" -inactive = "#9893a5" -subtle = "#6e6a86" -text = "#575279" -love = "#b4637a" -gold = "#ea9d34" -rose = "#d7827e" -pine = "#286983" -foam = "#56949f" -iris = "#907aa9" -highlight = "#dfdad9" -highlightInactive = "#f4ede8" -highlightOverlay = "#cecacd" +base = "#faf4ed" +surface = "#fffaf3" +overlay = "#f2e9e1" +muted = "#9893a5" +subtle = "#797593" +text = "#575279" +love = "#b4637a" +love_10 = "#f6e4e0" +gold = "#ea9d34" +gold_10 = "#fbead8" +rose = "#d7827e" +rose_10 = "#fae8e1" +pine = "#286983" +pine_10 = "#e5e6e2" +foam = "#56949f" +foam_10 = "#eaeae5" +iris = "#907aa9" +iris_10 = "#f1e8e6" +highlight_low = "#f4ede8" +highlight_med = "#dfdad9" +highlight_high = "#cecacd" \ No newline at end of file diff --git a/runtime/themes/rose_pine_moon.toml b/runtime/themes/rose_pine_moon.toml index 178d623b..fddf4911 100644 --- a/runtime/themes/rose_pine_moon.toml +++ b/runtime/themes/rose_pine_moon.toml @@ -1,92 +1,30 @@ -# Author: RayGervais -# Author: ChrisHa -# Author: ATahaBaki -# This theme is based on rose_pine theme. I just converted their -# rose_pine theme. +# Author: Rosé Pine +# Upstream: https://github.com/rose-pine/helix +# Contributing: +# Please submit changes to https://github.com/rose-pine/helix. +# The Rosé Pine team will update Helix, including you as a co-author. -"ui.background" = { bg = "base" } -"ui.menu" = { fg = "text", bg = "overlay" } -"ui.menu.selected" = { fg = "iris", bg = "surface" } -"ui.linenr" = {fg = "subtle" } -"ui.liner.selected" = "highlightOverlay" -"ui.selection" = { bg = "highlight" } -"comment" = "subtle" -"ui.cursorline" = {bg = "dimBase" } -"ui.statusline" = {fg = "foam", bg = "surface" } -"ui.statusline.insert" = {fg = "base", bg = "foam", modifiers = ["bold"]} -"ui.statusline.normal" = {fg = "base", bg = "rose", modifiers = ["bold"]} -"ui.statusline.select" = {fg = "base", bg = "iris", modifiers = ["bold"]} -"ui.statusline.inactive" = { fg = "iris", bg = "surface" } -"ui.cursor" = { fg = "rose", modifiers = ["reversed"] } -"ui.text" = { fg = "text" } -"ui.text.focus" = { fg = "foam", modifiers = ["bold"]} -"ui.text.info" = {fg = "pine", modifiers = ["bold"]} -"ui.virtual.whitespace" = "highlight" -"ui.virtual.ruler" = {bg = "dimBase" } -"operator" = "rose" -"variable" = "text" -"constant.numeric" = "iris" -"constant" = "gold" -"attribute" = "gold" -"type" = "foam" -"ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] } -"string" = "gold" -"constant.character.escape" = "subtle" -"function" = "rose" -"function.builtin" = "rose" -"function.method" = "foam" -"constructor" = "gold" -"special" = "gold" -"keyword" = "pine" -"label" = "iris" -"namespace" = "pine" -"ui.popup" = { bg = "surface" } -"ui.popup.info" = { bg = "surface" } -"ui.window" = { bg = "base" } -"ui.help" = { bg = "overlay", fg = "foam" } -"diff.plus" = "foam" -"diff.delta" = "rose" -"diff.minus" = "love" - -"info" = "gold" -"hint" = "gold" -"debug" = "rose" -"error" = "love" - -"diagnostic.error" = { underline = { style = "curl", color = "love" } } -"diagnostic.warning" = { underline = { style = "curl", color = "gold" } } -"diagnostic.info" = { underline = { style = "curl", color = "foam" } } -"diagnostic.hint" = { underline = { style = "curl", color = "iris" } } - -"markup.heading.marker" = "subtle" -"markup.heading.1" = { fg = "love", modifiers = ["bold"] } -"markup.heading.2" = { fg = "gold", modifiers = ["bold"] } -"markup.heading.3" = { fg = "rose", modifiers = ["bold"] } -"markup.heading.4" = { fg = "pine", modifiers = ["bold"] } -"markup.heading.5" = { fg = "foam", modifiers = ["bold"] } -"markup.heading.6" = { fg = "iris", modifiers = ["bold"] } -"markup.list" = { fg = "love" } -"markup.bold" = { fg = "gold", modifiers = ["bold"] } -"markup.italic" = { fg = "iris", modifiers = ["italic"] } -"markup.link.url" = { fg = "pine", modifiers = ["underlined"]} -"markup.link.text" = { fg = "foam" } -"markup.quote" = { fg = "rose" } -"markup.raw" = { fg = "foam" } +inherits = "rose_pine" [palette] -dimBase = "#201e30" -base = "#232136" -surface = "#2a273f" -overlay = "#393552" -inactive = "#6e6a86" -subtle = "#908caa" -text = "#e0def4" -love = "#eb6f92" -gold = "#f6c177" -rose = "#ea9a97" -pine = "#3e8fb0" -foam = "#9ccfd8" -iris = "#c4a7e7" -highlight = "#44415a" -highlightInactive = "#2a283e" -highlightOverlay = "#56526e" +base = "#232136" +surface = "#2a273f" +overlay = "#393552" +muted = "#6e6a86" +subtle = "#908caa" +text = "#e0def4" +love = "#eb6f92" +love_10 = "#3a2841" +gold = "#f6c177" +gold_10 = "#39313e" +rose = "#ea9a97" +rose_10 = "#392d41" +pine = "#3e8fb0" +pine_10 = "#252c44" +foam = "#9ccfd8" +foam_10 = "#2e3248" +iris = "#c4a7e7" +iris_10 = "#342e4a" +highlight_low = "#2a283e" +highlight_med = "#44415a" +highlight_high = "#56526e" \ No newline at end of file