andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

Theme: Papercolor: Cleanup, linting and using inheritance (#8276)

Browse Source
This commit is contained in:
Henrik Tjäder 2023-09-14 00:37:53 +02:00 committed by GitHub
parent fe6b556f51
commit 764172d5bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 262 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

189
runtime/themes/papercolor-dark.toml
View File

@ -1,124 +1,75 @@
# Palette based on https://github.com/NLKNguyen/papercolor-theme # Palette based on https://github.com/NLKNguyen/papercolor-theme
# Author: Soc Virnyl Estela <socvirnyl.estela@gmail.com> # Author: Soc Virnyl Estela <socvirnyl.estela@gmail.com>
"ui.linenr.selected" = { fg = "linenr_fg_selected" } inherits = "papercolor-light"
"ui.background" = {bg="background"}
"ui.text" = "foreground"
"ui.text.focus" = { fg = "selection_background", modifiers = ["bold"]}
"ui.selection" = {bg="selection_background", fg="selection_foreground"}
"ui.cursorline" = {bg="cursorline_background"}
"ui.highlight" = {bg="cursorline_background"}
"ui.statusline" = {bg="paper_bar_bg", fg="regular0"}
"ui.statusline.select" = {bg="background", fg="bright7"}
"ui.statusline.normal" = {bg="background", fg="bright3"}
"ui.statusline.inactive" = {bg="selection_foreground", fg="foreground"}
"ui.virtual.whitespace" = { fg = "regular5" }
"ui.virtual.ruler" = {bg="cursorline_background"}
"ui.cursor.match" = {bg = "regular5", fg = "regular0"}
"ui.cursor" = {bg = "regular5", fg = "background"}
"ui.window" = {bg = "#303030", fg = "bright2"}
"ui.help" = {bg = "background", fg = "bright2"}
"ui.popup" = {bg = "#303030", fg = "bright6"}
"ui.menu" = {bg = "#303030", fg = "bright6"}
"ui.menu.selected" = {bg = "#C6C6C6", fg="selection_foreground"}
"markup.heading" = { fg = "regular4", modifiers = ["bold"] }
"markup.heading.1" = { fg = "bright2", modifiers = ["bold"] }
"markup.heading.2" = { fg = "bright5", modifiers = ["bold"] }
"markup.heading.3" = { fg = "bright3", modifiers = ["bold"] }
"markup.heading.4" = { fg = "bright5", modifiers = ["bold"] }
"markup.heading.5" = { fg = "bright5", modifiers = ["bold"] }
"markup.heading.6" = { fg = "bright5", modifiers = ["bold"] }
"markup.list" = "bright3"
"markup.bold" = { fg = "foreground", modifiers = ["bold"] }
"markup.italic" = { fg = "bright0", modifiers = ["italic"] }
"markup.strikethrough" = { modifiers = ["crossed_out"] }
"markup.link.url" = { fg = "bright6", modifiers = ["underlined"] }
"markup.link.text" = "bright2"
"markup.link.label" = { fg = "regular2", modifiers = ["bold"] }
"markup.raw" = "foreground"
"string" = "foreground"
"attribute" = "bright7"
"keyword" = { fg = "regular4", modifiers = ["bold"]}
"keyword.directive" = "regular4"
"keyword.control.conditional" = "bright3"
"keyword.function" = "regular4"
"namespace" = "bright1"
"type" = "bright2"
"type.builtin" = { fg = "foreground", modifiers = ["bold"]}
"variable" = "foreground"
"variable.builtin" = "cyan"
"variable.other.member" = "cyan"
"variable.parameter" = "foreground"
"special" = "#3E999F"
"function" = "bright6"
"constructor" = "regular4"
"function.builtin" = { fg = "foreground", modifiers = ["bold"]}
"function.macro" = { fg = "regular4", modifiers = ["bold"] }
"comment" = { fg = "#686868", modifiers = ["dim"] }
"ui.linenr" = { fg = "bright0" }
"module" = "regular4"
"constant" = "bright5"
"constant.builtin" = "bright6"
"constant.numeric" = "bright5"
"constant.character.escape" = { fg = "foreground", modifiers = ["bold"]}
"operator" = { fg = "regular4", modifiers = ["bold"]}
"label" = { fg = "selection_background", modifiers = ["bold", "italic"] }
"diff.plus" = "regular2"
"diff.delta" = "regular6"
"diff.minus" = "regular1"
"warning" = "bright4"
"error" = "regular1"
"info" = "bright4"
"diagnostic.warning".underline = { color = "bright4", style = "curl" }
"diagnostic.error".underline = { color = "regular1", style = "curl" }
"diagnostic.info".underline = { color = "bright4", style = "curl" }
"diagnostic.hint".underline = { color = "bright4", style = "curl" }
[palette] [palette]
background="#1c1c1c" background = "#1c1c1c"
foreground="#d0d0d0" foreground = "#d0d0d0"
regular0="#1c1c1c"
regular1="#af005f" regular0 = "#1c1c1c" # color00 "Background"
regular2="#5faf00" regular1 = "#af005f" # color01 "Negative"
regular3="#d7af5f" regular2 = "#5faf00" # color02 "Positive"
regular4="#5fafd7" regular3 = "#d7af5f" # color03 "Olive"
regular5="#808080" regular4 = "#5fafd7" # color04 "Neutral" / Aqua
regular6="#d7875f" regular5 = "#808080" # color05 "Comment"
regular7="#d0d0d0" regular6 = "#d7875f" # color06 "Navy"
bright0="#585858" regular7 = "#d0d0d0" # color07 "Foreground"
bright1="#5faf5f" bright0 = "#585858" # color08 "Nontext"
bright2="#afd700" bright1 = "#5faf5f" # color09 "Red"
bright3="#af87d7" bright2 = "#afd700" # color10 "Pink"
bright4="#FFAF00" bright3 = "#af87d7" # color11 "Purple"
bright5="#ff5faf" bright4 = "#ffaf00" # color12 "Accent"
bright6="#00afaf" bright5 = "#ff5faf" # color13 "Orange"
bright7="#5f8787" bright6 = "#00afaf" # color14 "Blue"
selection_foreground="#585858" bright7 = "#5f8787" # color15 "Highlight"
selection_background="#8787AF"
cursorline_background="#303030" selection_fg = "#000000"
paper_bar_bg="#5F8787" selection_bg = "#8787af"
black="#1c1c1c" selection_secondary_fg = "#333333"
red="#af005f" selection_secondary_bg = "#707097"
green="#5faf00" special = "#3e999f"
yellow="#d7af5f"
blue="#5fafd7" cursorline_bg = "#303030"
magenta="#808080" cursorline_secondary_bg = "#2a2a2a"
cyan="#d7875f" cursorcolumn_bg = "#303030"
gray="#d0d0d0" cursorcolumn_secondary_bg = "#2a2a2a"
light-red="#5faf5f" cursorlinenr_fg = "#ffff00"
light-green="#afd700" popupmenu_fg = "#c6c6c6"
light-yellow="#af87d7" popupmenu_bg = "#303030"
light-blue="#FFAF00" linenumber_fg = "#585858"
light-magenta="#ff5faf" vertsplit_fg = "#5f8787"
light-cyan="#00afaf" statusline_active_fg = "#1c1c1c"
light-gray="#5f8787" statusline_active_bg = "#5f8787"
white="#808080" statusline_inactive_fg = "#bcbcbc"
linenr_fg_selected="#FFFF00" statusline_inactive_bg = "#3a3a3a"
todo_fg = "#ff8700"
error_fg = "#af005f"
error_bg = "#5f0000"
matchparen_bg = "#4e4e4e"
matchparen_fg = "#c6c6c6"
wildmenu_fg = "#1c1c1c"
wildmenu_bg = "#afd700"
diffadd_fg = "#87d700"
diffadd_bg = "#005f00"
diffdelete_fg = "#af005f"
diffdelete_bg = "#5f0000"
diffchange_bg = "#005f5f"
# 16 bit ANSI color names
black = "#1c1c1c"
red = "#af005f"
green = "#5faf00"
yellow = "#d7af5f"
blue = "#5fafd7"
magenta = "#808080"
cyan = "#d7875f"
white = "#d0d0d0"
light-black = "#585858"
light-red = "#5faf5f"
light-green = "#afd700"
light-yellow = "#af87d7"
light-blue = "#ffaf00"
light-magenta = "#ff5faf"
light-cyan = "#00afaf"
light-white = "#5f8787"

297
runtime/themes/papercolor-light.toml
View File

@ -1,31 +1,124 @@
# Palette based on https://github.com/NLKNguyen/papercolor-theme # Palette based on https://github.com/NLKNguyen/papercolor-theme
# Author: Soc Virnyl Estela <socvirnyl.estela@gmail.com> # Author: Soc Virnyl Estela <socvirnyl.estela@gmail.com>
"ui.linenr.selected" = { fg = "linenr_fg_selected" } "ui.linenr.selected" = { fg = "cursorlinenr_fg", modifiers = ["bold"] }
"ui.background" = {bg="background"} "ui.linenr" = { fg = "linenumber_fg" }
"ui.background" = { bg = "background" }
"ui.text" = "foreground" "ui.text" = "foreground"
"ui.text.focus" = { fg = "selection_background", modifiers = ["bold"]} "ui.text.focus" = { fg = "selection_bg", modifiers = ["bold"] }
"ui.selection" = {bg="selection_background", fg="selection_foreground"} "ui.selection" = { bg = "selection_secondary_bg", fg = "selection_secondary_fg" }
"ui.highlight" = {bg="cursorline_background"} "ui.selection.primary" = { bg = "selection_bg", fg = "selection_fg" }
"ui.cursorline" = {bg="cursorline_background"} "ui.highlight" = { bg = "cursorline_bg" }
"ui.statusline" = {bg="paper_bar_bg", fg="regular0"}
"ui.statusline.select" = {bg="background", fg="bright7"}
"ui.statusline.normal" = {bg="background", fg="bright3"}
"ui.statusline.inactive" = {bg="bright0", fg="foreground"}
"ui.virtual" = "indent"
"ui.virtual.whitespace" = { fg = "regular5" }
"ui.virtual.ruler" = {bg="cursorline_background"}
"ui.cursor.match" = {bg = "regular5", fg = "regular0"}
"ui.cursor" = {bg = "regular5", fg = "background"}
"ui.window" = {bg = "#D0D0D0", fg = "bright2"}
"ui.help" = {bg = "background", fg = "bright2"}
"ui.popup" = {bg = "#D0D0D0", fg = "bright7"}
"ui.menu" = {bg = "#D0D0D0", fg = "bright7"}
"ui.menu.selected" = {bg = "selection_background", fg="selection_foreground"}
"markup.heading" = { fg = "bright7", modifiers = ["bold"] } "ui.cursorline" = { bg = "cursorline_bg" }
"ui.cursorline.secondary" = { bg = "cursorline_secondary_bg" }
"ui.cursorcolumn" = { bg = "cursorline_bg" }
"ui.cursorcolumn.secondary" = { bg = "cursorcolumn_secondary_bg" }
"ui.statusline" = { bg = "statusline_active_bg", fg = "statusline_active_fg" }
"ui.statusline.inactive" = { bg = "statusline_inactive_bg", fg = "statusline_inactive_fg" }
"ui.statusline.normal" = { bg = "statusline_inactive_bg", fg = "bright6" }
"ui.statusline.insert" = { bg = "statusline_inactive_bg", fg = "bright4" }
"ui.statusline.select" = { bg = "statusline_inactive_bg", fg = "regular3" }
"ui.statusline.separator" = { bg = "statusline_active_bg", fg = "statusline_active_bg" }
"ui.virtual" = { fg = "cursorlinenr_fg" }
"ui.virtual.whitespace" = { fg = "regular5" }
"ui.virtual.indent-guide" = { fg = "bright0" }
"ui.virtual.ruler" = { bg = "cursorline_secondary_bg", fg = "regular4" }
"ui.cursor.match" = { bg = "matchparen_bg", fg = "matchparen_fg" }
"ui.cursor" = { bg = "regular5", fg = "background" }
"ui.cursor.primary" = { bg = "foreground", fg = "background" }
"ui.window" = { fg = "vertsplit_fg" }
"ui.help" = { bg = "wildmenu_bg", fg = "wildmenu_fg" }
"ui.popup" = { bg = "popupmenu_bg", fg = "popupmenu_fg" }
"ui.popup.info" = { bg = "popupmenu_bg", fg = "bright7", modifiers = ["bold"] }
"ui.menu" = { bg = "popupmenu_bg", fg = "foreground" }
"ui.menu.selected" = { bg = "selection_bg", fg = "selection_fg" }
"warning" = "bright5"
"error" = { bg = "error_bg", fg = "error_fg" }
"info" = "todo_fg"
"diagnostic.warning" = { fg = "bright0", modifiers = [
"dim",
], underline = { color = "bright5", style = "curl" } }
"diagnostic.error".underline = { color = "bright1", style = "curl" }
"diagnostic.info".underline = { color = "bright4", style = "curl" }
"diagnostic.hint".underline = { color = "bright6", style = "curl" }
# Tree-sitter scopes for syntax highlighting
"attribute" = "bright4"
"type" = { fg = "bright2", modifiers = ["bold"] }
"type.builtin" = { fg = "bright2", modifiers = ["bold"] }
"type.enum" = { fg = "foreground" }
"type.enum.variant" = { fg = "foreground" }
"constructor" = "foreground"
"constant" = "bright5"
"constant.builtin" = "regular3"
"constant.builtin.boolean" = { fg = "regular2", modifiers = ["bold"] }
"constant.character.escape" = { fg = "bright3", modifiers = ["bold"] }
"constant.character" = { fg = "regular3" }
"constant.numeric" = "bright5"
"string" = "regular3"
"string.regexp" = "bright3"
"comment" = { fg = "regular5", modifiers = ["italic"] }
"comment.line" = { fg = "regular5", modifiers = ["italic"] }
"comment.block" = { fg = "regular5", modifiers = ["italic"] }
"comment.block.documentation" = { fg = "regular5", modifiers = ["bold"] }
"variable" = "foreground"
"variable.builtin" = "bright5"
"variable.other.member" = "foreground"
"variable.parameter" = "foreground"
"label" = { fg = "selection_bg", modifiers = ["bold", "italic"] }
"punctuation" = { fg = "foreground" }
"punctuation.delimiter" = { fg = "regular4", modifiers = ["bold"] }
"punctuation.bracket" = { fg = "foreground" }
"punctuation.special" = { fg = "bright1", modifiers = ["bold"] }
"keyword" = { fg = "bright2" }
"keyword.control" = "bright1"
"keyword.control.conditional" = { fg = "bright3", modifiers = ["bold"] }
"keyword.control.repeat" = { fg = "bright3", modifiers = ["bold"] }
"keyword.control.import" = { fg = "bright2" }
"keyword.control.return" = { fg = "bright2" }
"keyword.control.exception" = { fg = "bright1" }
"keyword.operator" = { fg = "regular4", modifiers = ["bold"] }
"keyword.directive" = "regular4"
"keyword.function" = "bright2"
"keyword.storage" = "bright2"
"keyword.storage.type" = { fg = "regular4", modifiers = ["bold"] }
"keyword.storage.modifier" = { fg = "regular6", modifiers = ["bold"] }
"keyword.storage.modifier.ref" = { fg = "regular4", modifiers = ["bold"] }
"keyword.special" = "bright1"
"operator" = { fg = "regular4", modifiers = ["bold"] }
"function" = { fg = "foreground" }
"function.builtin" = { fg = "bright6" }
"function.method" = { fg = "foreground" }
"function.macro" = { fg = "regular3", modifiers = ["bold"] }
"function.special" = { fg = "bright4" }
"tag" = { fg = "regular4" }
"namespace" = "bright6"
"special" = "special"
"markup.heading" = { fg = "bright4", modifiers = ["bold"] }
"markup.heading.marker" = { fg = "bright2", modifiers = ["bold"] }
"markup.heading.1" = { fg = "bright2", modifiers = ["bold"] } "markup.heading.1" = { fg = "bright2", modifiers = ["bold"] }
"markup.heading.2" = { fg = "bright4", modifiers = ["bold"] } "markup.heading.2" = { fg = "bright5", modifiers = ["bold"] }
"markup.heading.3" = { fg = "bright3", modifiers = ["bold"] } "markup.heading.3" = { fg = "bright3", modifiers = ["bold"] }
"markup.heading.4" = { fg = "bright4", modifiers = ["bold"] } "markup.heading.4" = { fg = "bright4", modifiers = ["bold"] }
"markup.heading.5" = { fg = "bright4", modifiers = ["bold"] } "markup.heading.5" = { fg = "bright4", modifiers = ["bold"] }
@ -34,90 +127,84 @@
"markup.bold" = { fg = "foreground", modifiers = ["bold"] } "markup.bold" = { fg = "foreground", modifiers = ["bold"] }
"markup.italic" = { modifiers = ["italic"] } "markup.italic" = { modifiers = ["italic"] }
"markup.strikethrough" = { modifiers = ["crossed_out"] } "markup.strikethrough" = { modifiers = ["crossed_out"] }
"markup.link.url" = { fg = "regular4", modifiers = ["underlined"] } "markup.link.url" = { fg = "bright6", underline.style = "line" }
"markup.link.text" = "bright2" "markup.link.text" = "bright2"
"markup.link.label" = { fg = "regular7", modifiers = ["bold"] } "markup.link.label" = { fg = "regular2", modifiers = ["bold"] }
"markup.raw" = "foreground" "markup.quote" = "regular4"
# Both inline and block code
"string" = "foreground" "markup.raw" = "regular3"
"attribute" = "bright7"
"keyword" = { fg = "regular4", modifiers = ["bold"]}
"keyword.directive" = "regular1"
"namespace" = "regular1"
"type" = "bright2"
"type.builtin" = { fg = "regular4", modifiers = ["bold"]}
"variable" = "foreground"
"variable.builtin" = "cyan"
"variable.other.member" = "regular4"
"variable.parameter" = "foreground"
"special" = "#3E999F"
"function" = "bright1"
"constructor" = "bright1"
"function.builtin" = { fg = "regular4", modifiers = ["bold"]}
"function.macro" = { fg = "regular1" }
"comment" = { fg = "bright0", modifiers = ["dim"] }
"ui.linenr" = { fg = "bright0" }
"module" = "#af0000"
"constant" = "#5f8700"
"constant.builtin" = "#5f8700"
"constant.numeric" = "#d75f00"
"constant.character.escape" = { fg = "#8700af", modifiers = ["bold"]}
"operator" = { fg = "regular4", modifiers = ["bold"]}
"label" = { fg = "selection_background", modifiers = ["bold", "italic"] }
"diff.plus" = "regular2"
"diff.delta" = "bright0"
"diff.minus" = "bright1"
"warning" = "bright4"
"error" = "regular1"
"info" = "#FFAF00"
"diagnostic.warning".underline = { color = "bright4", style = "curl" }
"diagnostic.error".underline = { color = "regular1", style = "curl" }
"diagnostic.info".underline = { color = "#FFAF00", style = "curl" }
"diagnostic.hint".underline = { color = "#FFAF00", style = "curl" }
"diff.plus" = { bg = "diffadd_bg", fg = "diffadd_fg" }
"diff.delta" = { bg = "diffchange_bg" }
"diff.delta.moved" = { modifiers = ["italic"] }
"diff.minus" = { bg = "diffdelete_bg", fg = "diffdelete_fg" }
[palette] [palette]
background="#eeeeee" background = "#eeeeee"
foreground="#444444" foreground = "#444444"
regular0="#eeeeee" regular0 = "#eeeeee" # color00 "Background"
regular1="#af0000" regular1 = "#af0000" # color01 "Negative"
regular2="#008700" regular2 = "#008700" # color02 "Positive"
regular3="#5f8700" regular3 = "#5f8700" # color03 "Olve"
regular4="#0087af" regular4 = "#0087af" # color04 "Neutral" / Aqua
regular5="#878787" regular5 = "#878787" # color05 "Comment"
regular6="#005f87" regular6 = "#005f87" # color06 "Navy"
regular7="#764e37" regular7 = "#444444" # color07 "Foreground"
bright0="#bcbcbc" bright0 = "#bcbcbc" # color08 "Nontext"
bright1="#d70000" bright1 = "#d70000" # color09 "Red"
bright2="#d70087" bright2 = "#d70087" # color10 "Pink"
bright3="#8700af" bright3 = "#8700af" # color11 "Purple"
bright4="#d75f00" bright4 = "#d75f00" # color12 "Accent"
bright5="#d75f00" bright5 = "#d75f00" # color13 "Orange"
bright6="#4c7a5d" bright6 = "#005faf" # color14 "Blue"
bright7="#005faf" bright7 = "#005f87" # color15 "Highlight"
selection_foreground="#eeeeee"
selection_background="#0087af" selection_fg = "#eeeeee"
cursorline_background="#fdfdfd" selection_bg = "#0087af"
paper_bar_bg="#005F87" selection_secondary_fg = "#d9d7d7"
black="#eeeeee" selection_secondary_bg = "#2c687a"
red="#d70000" special = "#3e999f"
green="#008700"
yellow="#5f8700" cursorline_bg = "#e4e4e4"
blue="#0087af" cursorline_secondary_bg = "#eaeaea"
magenta="#878787" cursorcolumn_bg = "#e4e4e4"
cyan="#005f87" cursorcolumn_secondary_bg = "#eaeaea"
gray="#764e37" cursorlinenr_fg = "#af5f00"
light-red="#d70000" popupmenu_fg = "#444444"
light-green="#d70087" popupmenu_bg = "#d0d0d0"
light-yellow="#8700af" linenumber_fg = "#b2b2b2"
light-blue="#d75f00" vertsplit_fg = "#005f87"
light-magenta="#d75f00" statusline_active_fg = "#e4e4e4"
light-cyan="#4c7a4d" statusline_active_bg = "#005f87"
light-gray="#005faf" statusline_inactive_fg = "#444444"
white="#444444" statusline_inactive_bg = "#d0d0d0"
linenr_fg_selected="#AF634D" todo_fg = "#00af5f"
error_fg = "#af0000"
error_bg = "#ffd7ff"
matchparen_bg = "#c6c6c6"
matchparen_fg = "#005f87"
wildmenu_fg = "#444444"
wildmenu_bg = "#ffff00"
diffadd_fg = "#008700"
diffadd_bg = "#afffaf"
diffdelete_fg = "#af0000"
diffdelete_bg = "#ffd7ff"
diffchange_bg = "#ffd787"
# 16 bit ANSI color names
black = "#eeeeee"
red = "#d70000"
green = "#008700"
yellow = "#5f8700"
blue = "#0087af"
magenta = "#878787"
cyan = "#005f87"
white = "#444444"
light-black = "#bcbcbc"
light-red = "#d70000"
light-green = "#d70087"
light-yellow = "#8700af"
light-blue = "#d75f00"
light-magenta = "#d75f00"
light-cyan = "#4c7a4d"
light-white = "#005faf"