From 7ac72a39cbcaeda31c717418bde068f9bfc32d0e Mon Sep 17 00:00:00 2001 From: leonqadirie <39130739+leonqadirie@users.noreply.github.com> Date: Wed, 28 Dec 2022 01:55:40 +0100 Subject: [PATCH] Fix kanagawa theme lint and added git gutter colors (#5273) * Fix kanagawa theme lint Comprises 4 changes: 1. added "sumiInk3" as ui.cursorline.primary bg color 2. switched the cursor bg and fg colors (now in line with original theme) 3. added ui.menu and ui.selected colors 4. separated ui.selection and ui.selection.primary * Add git gutter colors to kanagawa theme In line with original: autumnGreen for adds autumnRed for deletes autumnYellow for changes * Add indent-guides and linenr.selected to kanagawa * indent-guides are sumiInk4 * Add ui.linenr.selected is roninYellow * Set ui.help bg to sumiInk1 --- runtime/themes/kanagawa.toml | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/runtime/themes/kanagawa.toml b/runtime/themes/kanagawa.toml index 50a7c0a78..faeeeb830 100644 --- a/runtime/themes/kanagawa.toml +++ b/runtime/themes/kanagawa.toml @@ -7,10 +7,14 @@ # because of some theming differences, it's not an exact copy of the original. ## User interface -"ui.selection" = { bg = "waveBlue1" } +"ui.selection" = { bg = "waveBlue2" } +"ui.selection.primary" = { bg = "waveBlue1" } "ui.background" = { fg = "fujiWhite", bg = "sumiInk1" } "ui.linenr" = { fg = "sumiInk4" } +"ui.linenr.selected" = { fg = "roninYellow" } + +"ui.virtual.indent-guide" = "sumiInk4" "ui.statusline" = { fg = "oldWhite", bg = "sumiInk0" } "ui.statusline.inactive" = { fg = "fujiGray", bg = "sumiInk0" } @@ -23,15 +27,19 @@ "ui.popup" = { fg = "fujiWhite", bg = "sumiInk0" } "ui.window" = { fg = "fujiWhite" } -"ui.help" = { fg = "fujiWhite", bg = "waveBlue1" } +"ui.help" = { fg = "fujiWhite", bg = "sumiInk1" } "ui.text" = "fujiWhite" "ui.text.focus" = { fg = "fujiWhite", bg = "waveBlue1", modifiers = ["bold"] } "ui.virtual" = "waveBlue1" -"ui.cursor" = { fg = "fujiWhite", bg = "waveBlue1"} -"ui.cursor.primary" = { fg = "seaFoam", bg = "waveBlue1" } +"ui.cursor" = { fg = "waveBlue1", bg = "fujiWhite"} +"ui.cursor.primary" = { fg = "waveBlue1", bg = "seaFoam" } "ui.cursor.match" = { fg = "seaFoam", modifiers = ["bold"] } "ui.highlight" = { fg = "fujiWhite", bg = "waveBlue2" } +"ui.menu" = { fg = "fujiWhite", bg = "sumiInk1" } +"ui.menu.selected" = { fg = "fujiWhite", bg = "waveBlue1" } + +"ui.cursorline.primary" = { bg = "sumiInk3"} diagnostic = { modifiers = ["underlined"] } @@ -40,6 +48,11 @@ warning = "roninYellow" info = "waveAqua1" hint = "dragonBlue" +## Git gutter +"diff.plus" = "autumnGreen" +"diff.minus" = "autumnRed" +"diff.delta" = "autumnYellow" + ## Syntax highlighting "type" = "waveAqua2" "constant" = "surimiOrange" @@ -54,8 +67,8 @@ hint = "dragonBlue" "variable.other.member" = "carpYellow" "label" = "springBlue" "punctuation" = "springViolet2" -"punctuation.delimiter" = "springViolet2" -"punctuation.bracket" = "springViolet2" +"punctuation.delimiter" = "springViolet2" +"punctuation.bracket" = "springViolet2" "keyword" = "oniViolet" "keyword.directive" = "peachRed" "operator" = "boatYellow2" @@ -122,4 +135,4 @@ 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 \ No newline at end of file +katanaGray = "#717C7C" # deprecated