From 2532928143bc3a8ff8a06f1c10cc1b1396e59353 Mon Sep 17 00:00:00 2001 From: Andrey Popp <8mayday@gmail.com> Date: Fri, 27 Apr 2018 22:02:37 +0300 Subject: Add colors back a bit --- colors/off.vim | 61 +++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 18 deletions(-) diff --git a/colors/off.vim b/colors/off.vim index 142bbb5..d912625 100644 --- a/colors/off.vim +++ b/colors/off.vim @@ -24,8 +24,8 @@ let s:actual_white = { "gui": "#FFFFFF", "cterm": "231" } let s:light_black = { "gui": "#424242", "cterm": "8" } let s:lighter_black = { "gui": "#545454", "cterm": "240" } let s:subtle_black = { "gui": "#303030", "cterm": "236" } -let s:light_gray = { "gui": "#B2B2B2", "cterm": "249" } -let s:lighter_gray = { "gui": "#C6C6C6", "cterm": "251" } +let s:light_gray = { "gui": "#999999", "cterm": "249" } +let s:lighter_gray = { "gui": "#E1E1E1", "cterm": "251" } let s:pink = { "gui": "#fb007a", "cterm": "9" } let s:dark_red = { "gui": "#C30771", "cterm": "1" } let s:light_red = { "gui": "#E32791", "cterm": "1" } @@ -55,9 +55,9 @@ if &background == "dark" let s:red = s:light_red let s:visual = s:lighter_black else - let s:bg = s:actual_white - let s:bg_subtle = s:light_gray - let s:bg_very_subtle = s:lighter_gray + let s:bg = s:white + let s:bg_subtle = s:light_black + let s:bg_very_subtle = s:light_gray let s:norm = s:light_black let s:norm_subtle = s:lighter_black let s:purple = s:dark_purple @@ -80,11 +80,12 @@ function! s:h(group, style) endfunction call s:h("Normal", {"bg": s:bg, "fg": s:norm}) -call s:h("Cursor", {"bg": s:blue, "fg": s:norm }) -call s:h("Comment", {"fg": s:bg_subtle, "gui": "italic"}) +call s:h("Noise", {"bg": s:bg, "fg": s:norm_subtle}) +call s:h("Cursor", {"bg": s:blue, "fg": s:norm}) +call s:h("Comment", {"fg": s:bg_very_subtle, "gui": "italic"}) "call s:h("Constant", {"fg": s:cyan}) -hi! link Constant Normal +call s:h("Constant", {"bg": s:bg, "fg": s:dark_blue}) hi! link Character Constant hi! link Number Constant hi! link Boolean Constant @@ -95,18 +96,18 @@ hi! link String Constant hi! link Identifier Normal hi! link Function Identifier -"call s:h("Statement", {"fg": s:green}) -hi! link Statement Normal +"hi! link Statement Normal +call s:h("Statement", {"bg": s:bg, "fg": s:norm, "gui": "bold"}) hi! link Conditonal Statement hi! link Repeat Statement hi! link Label Statement -hi! link Operator Statement +hi! link Operator Noise hi! link Keyword Statement hi! link Exception Statement "call s:h("PreProc", {"fg": s:red}) hi! link PreProc Normal -hi! link Include PreProc +hi! link Include Statement hi! link Define PreProc hi! link Macro PreProc hi! link PreCondit PreProc @@ -127,14 +128,14 @@ hi! link Debug Special call s:h("Underlined", {"fg": s:norm, "gui": "underline", "cterm": "underline"}) call s:h("Ignore", {"fg": s:bg}) -call s:h("Error", {"fg": s:actual_white, "bg": s:red, "cterm": "bold"}) +call s:h("Error", {"fg": s:red, "bg": s:bg, "cterm": "bold"}) call s:h("Todo", {"fg": s:actual_white, "bg": s:pink, "gui": "bold", "cterm": "bold"}) call s:h("SpecialKey", {"fg": s:light_green}) call s:h("NonText", {"fg": s:medium_gray}) call s:h("Directory", {"fg": s:dark_blue}) call s:h("ErrorMsg", {"fg": s:pink}) call s:h("IncSearch", {"bg": s:yellow, "fg": s:light_black}) -call s:h("Search", {"bg": s:bg_subtle, "fg": s:norm}) +call s:h("Search", {"bg": s:yellow, "fg": s:light_black}) call s:h("MoreMsg", {"fg": s:medium_gray, "cterm": "bold", "gui": "bold"}) hi! link ModeMsg MoreMsg call s:h("LineNr", {"fg": s:bg_subtle}) @@ -147,7 +148,7 @@ call s:h("Title", {"fg": s:dark_blue}) call s:h("Visual", {"bg": s:visual}) call s:h("VisualNOS", {"bg": s:bg_subtle}) call s:h("WarningMsg", {"fg": s:red}) -call s:h("WildMenu", {"fg": s:bg, "bg": s:norm}) +call s:h("WildMenu", {"fg": s:black, "bg": s:bg_very_subtle}) call s:h("Folded", {"fg": s:medium_gray}) call s:h("FoldColumn", {"fg": s:bg_subtle}) call s:h("DiffAdd", {"fg": s:green}) @@ -168,7 +169,7 @@ else call s:h("SpellLocal", {"cterm": "underline", "fg": s:dark_green}) endif -call s:h("Pmenu", {"fg": s:norm, "bg": s:bg_subtle}) +call s:h("Pmenu", {"fg": s:norm, "bg": s:lighter_gray}) call s:h("PmenuSel", {"fg": s:norm, "bg": s:blue}) call s:h("PmenuSbar", {"fg": s:norm, "bg": s:bg_subtle}) call s:h("PmenuThumb", {"fg": s:norm, "bg": s:bg_subtle}) @@ -176,10 +177,10 @@ call s:h("TabLine", {"fg": s:norm, "bg": s:bg_very_subtle}) call s:h("TabLineSel", {"fg": s:blue, "bg": s:bg_subtle, "gui": "bold", "cterm": "bold"}) call s:h("TabLineFill", {"fg": s:norm, "bg": s:bg_very_subtle}) call s:h("CursorColumn", {"bg": s:bg_very_subtle}) -call s:h("CursorLine", {"fg": s:norm, "bg": s:bg_very_subtle}) +call s:h("CursorLine", {"bg": s:lighter_gray}) call s:h("ColorColumn", {"bg": s:bg_subtle}) -call s:h("MatchParen", {"bg": s:bg_subtle, "fg": s:norm}) +call s:h("MatchParen", {"bg": s:lighter_gray, "fg": s:norm}) call s:h("qfLineNr", {"fg": s:medium_gray}) call s:h("htmlH1", {"bg": s:bg, "fg": s:norm}) @@ -200,3 +201,27 @@ hi link GitGutterAdd LineNr hi link GitGutterDelete LineNr hi link GitGutterChange LineNr hi link GitGutterChangeDelete LineNr + +hi link jsFlowTypeKeyword Statement +hi link jsFlowImportType Statement +hi link jsFunction Statement +hi link jsGlobalObjects Normal +hi link jsGlobalNodeObjects Normal +hi link jsArrowFunction Noise +hi link StorageClass Statement + +call s:h("xmlTag", {"bg": s:bg, "fg": s:dark_blue, "gui": "italic"}) +hi link xmlTagName xmlTag +hi link xmlEndTag xmlTag +hi link xmlAttrib xmlTag + +hi link markdownH1 Statement +hi link markdownH2 Statement +hi link markdownH3 Statement +hi link markdownH4 Statement +hi link markdownH5 Statement +hi link markdownH6 Statement +hi link markdownListMarker Statement +hi link markdownCode Statement +hi link markdownCodeDelimiter Statement +hi link markdownHeadingDelimiter Statement -- cgit v1.2.3