Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kanagawa: fix palette and attempt at a markdown compromise #12895

Merged
merged 5 commits into from
Mar 2, 2025
+54 −50
Merged

Kanagawa: fix palette and attempt at a markdown compromise #12895

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34eb2e8
Use actual palette, fix sumiInk colors, comment out unused colors
luetage Feb 17, 2025
5d2a4ec
Markdown improvements, nvim color for quotes, separate color for URLs
luetage Feb 17, 2025
4a6ea3a
Uncomment unused colors
luetage Feb 17, 2025
82604c5
Merge branch 'helix-editor:master' into kanagawa
luetage Mar 1, 2025
edbba0c
Add markup.heading.3
luetage Mar 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 54 additions & 50 deletions runtime/themes/kanagawa.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
## User interface
"ui.selection" = { bg = "waveBlue2" }
"ui.selection.primary" = { bg = "waveBlue2" }
"ui.background" = { fg = "fujiWhite", bg = "sumiInk1" }
"ui.background" = { fg = "fujiWhite", bg = "sumiInk3" }

"ui.linenr" = { fg = "sumiInk6" }
"ui.linenr.selected" = { fg = "roninYellow", modifiers = ["bold"] }
"ui.gutter" = { fg = "sumiInk6", bg = "sumiInk4" }

"ui.virtual" = "sumiInk6"
"ui.virtual.ruler" = { bg = "sumiInk2" }
"ui.virtual.ruler" = { bg = "sumiInk4" }
"ui.virtual.inlay-hint" = "sumiInk6"
"ui.virtual.jump-label" = { fg = "peachRed", modifiers = ["bold"] }

Expand All @@ -25,8 +25,6 @@
"ui.statusline.normal" = { fg = "sumiInk0", bg = "crystalBlue", modifiers = ["bold"] }
"ui.statusline.insert" = { fg = "sumiInk0", bg = "autumnGreen", modifiers = ["bold"] }
"ui.statusline.select" = { fg = "sumiInk0", bg = "oniViolet", modifiers = ["bold"] }
# Malformed ANSI: "". See 'https://github.com/helix-editor/helix/issues/5709'
# "ui.statusline.separator" = { fg = "", bg = "" }

"ui.bufferline" = { fg = "fujiGray", bg = "sumiInk0" }
"ui.bufferline.active" = { fg = "oldWhite", bg = "sumiInk0" }
Expand All @@ -46,8 +44,8 @@
"ui.menu.selected" = { fg = "fujiWhite", bg = "waveBlue2", modifiers = ["bold"] }
"ui.menu.scroll" = { fg = "oldWhite", bg = "waveBlue1" }

"ui.cursorline.primary" = { bg = "sumiInk3" }
"ui.cursorcolumn.primary" = { bg = "sumiInk3" }
"ui.cursorline.primary" = { bg = "sumiInk5" }
"ui.cursorcolumn.primary" = { bg = "sumiInk5" }

"ui.debug.breakpoint" = "springBlue"
"ui.debug.active" = "winterRed"
Expand Down Expand Up @@ -101,56 +99,62 @@ hint = "waveAqua1"
"special" = "peachRed"

## Markup modifiers
"markup.heading" = { fg = "springViolet2", modifiers = ["bold"] }
"markup.heading.marker" = "springViolet2"
"markup.heading" = { fg = "crystalBlue", modifiers = ["bold"] }
"markup.list" = "oniViolet"
"markup.heading.1" = { fg = "carpYellow", modifiers = ["bold"] }
"markup.heading.2" = { fg = "crystalBlue", modifiers = ["bold"] }
"markup.heading.3" = { fg = "waveAqua2", modifiers = ["bold"] }
"markup.list" = "sakuraPink"
"markup.bold" = { modifiers = ["bold"] }
"markup.italic" = { modifiers = ["italic"] }
"markup.strikethrough" = { modifiers = ["crossed_out"] }
"markup.link.text" = { fg = "springBlue" }
"markup.link.url" = { fg = "sakuraPink" }
"markup.link.url" = { fg = "lightBlue" }
"markup.link.label" = "surimiOrange"
"markup.quote" = "springViolet1"
"markup.quote" = "oniViolet2"
"markup.raw" = "springGreen"

[palette]
seaFoam = "#C7CCD1" # custom lighter foreground
fujiWhite = "#DCD7BA" # default foreground
oldWhite = "#C8C093" # dark foreground, e.g. statuslines
sumiInk0 = "#16161D" # dark background, e.g. statuslines, floating windows
sumiInk1 = "#1F1F28" # default background
sumiInk2 = "#2A2A37" # lighter background, e.g. colorcolumns, folds
sumiInk3 = "#363646" # lighter background, e.g. cursorline
sumiInk4 = "#2A2A37" # darker foreground, e.g. linenumbers, fold column
sumiInk6 = "#54546D" # inlay hints
waveBlue1 = "#223249" # popup background, visual selection background
waveBlue2 = "#2D4F67" # popup selection background, search background
winterGreen = "#2B3328" # diff add background
winterYellow = "#49443C" # diff change background
winterRed = "#43242B" # diff deleted background
winterBlue = "#252535" # diff line background
autumnGreen = "#76946A" # git add
autumnRed = "#C34043" # git delete
autumnYellow = "#DCA561" # git change
samuraiRed = "#E82424" # diagnostic error
roninYellow = "#FF9E3B" # diagnostic warning
waveAqua1 = "#6A9589" # diagnostic info
dragonBlue = "#658594" # diagnostic hint
fujiGray = "#727169" # comments
springViolet1 = "#938AA9" # light foreground
oniViolet = "#957FB8" # statements and keywords
oniViolet2 = "#B8B4D0" # parameters
crystalBlue = "#7E9CD8" # functions and titles
springViolet2 = "#9CABCA" # brackets and punctuation
springBlue = "#7FB4CA" # specials and builtins
lightBlue = "#A3D4D5" # not used!
waveAqua2 = "#7AA89F" # types
springGreen = "#98BB6C" # strings
boatYellow1 = "#938056" # not used
boatYellow2 = "#C0A36E" # operators, regex
carpYellow = "#E6C384" # identifiers
sakuraPink = "#D27E99" # numbers
waveRed = "#E46876" # standout specials 1, e.g. builtin variables
peachRed = "#FF5D62" # standout specials 2, e.g. exception handling, returns
surimiOrange = "#FFA066" # constants, imports, booleans
katanaGray = "#717C7C" # deprecated
oldWhite = "#C8C093" # dark foreground, e.g. statuslines
fujiWhite = "#DCD7BA" # default foreground
fujiGray = "#727169" # comments
sumiInk0 = "#16161D" # dark background, e.g. statuslines, floating windows
sumiInk1 = "#181820" # unused
sumiInk2 = "#1A1A22" # unused
sumiInk3 = "#1F1F28" # default background
sumiInk4 = "#2A2A37" # lighter background, e.g. colorcolumns, folds
sumiInk5 = "#363646" # lighter background, e.g. cursorline
sumiInk6 = "#54546D" # inlay hints
waveBlue1 = "#223249" # popup background, visual selection background
waveBlue2 = "#2D4F67" # popup selection background, search background
winterGreen = "#2B3328" # diff add background
winterYellow = "#49443C" # diff change background
winterRed = "#43242B" # diff delete background
winterBlue = "#252535" # diff line background
autumnGreen = "#76946A" # git add
autumnRed = "#C34043" # git delete
autumnYellow = "#DCA561" # git change
samuraiRed = "#E82424" # diagnostic error
roninYellow = "#FF9E3B" # diagnostic warning
waveAqua1 = "#6A9589" # diagnostic info
dragonBlue = "#658594" # diagnostic hint
oniViolet = "#957FB8" # statements and keywords
oniViolet2 = "#B8B4D0" # parameters
crystalBlue = "#7E9CD8" # functions and titles
springViolet1 = "#938AA9" # unused
springViolet2 = "#9CABCA" # brackets and punctuation
springBlue = "#7FB4CA" # specials and builtins
lightBlue = "#A3D4D5" # URLs
waveAqua2 = "#7AA89F" # types
waveAqua3 = "#68AD99" # unused
waveAqua4 = "#7AA880" # unused
waveAqua5 = "#6CAF95" # unused
springGreen = "#98BB6C" # strings
boatYellow1 = "#938056" # unused
boatYellow2 = "#C0A36E" # operators, regex
carpYellow = "#E6C384" # identifiers
sakuraPink = "#D27E99" # numbers
waveRed = "#E46876" # standout specials 1, e.g. builtin variables
peachRed = "#FF5D62" # standout specials 2, e.g. exception handling, returns
surimiOrange = "#FFA066" # constants, imports, booleans
katanaGray = "#717C7C" # unused