From dcb2f72bce5f4a5a1975bb9fe22f60605791990e Mon Sep 17 00:00:00 2001 From: ManjaroOne666 Date: Mon, 7 May 2018 18:50:40 +0100 Subject: [PATCH] more light colours --- vim/colors/monotonous.vim | 149 ++++++++++++++++++++------------------ 1 file changed, 77 insertions(+), 72 deletions(-) diff --git a/vim/colors/monotonous.vim b/vim/colors/monotonous.vim index e104989..3cde38c 100644 --- a/vim/colors/monotonous.vim +++ b/vim/colors/monotonous.vim @@ -1,4 +1,4 @@ -" set bg=light +set background=light highlight clear if exists('syntax_on') @@ -9,8 +9,8 @@ let g:colors_name = 'monotonous' let g:d_normal_fg = '#555555' let g:d_normal_bg = has('gui_running') ? '#000000' : 'NONE' -let g:l_normal_fg = '#444444' -let g:l_normal_bg = '#eeeeee' +let g:l_normal_fg = '#424242' +let g:l_normal_bg = '#dddddd' " call SetColor('', '', '', '', '', '') @@ -18,54 +18,52 @@ call SetColor('Normal', g:d_normal_fg, g:d_normal_bg, g:l_normal_fg, g:l_normal_ " highlight groups "{{{ -" hi! ColorColumn guibg=#1d0808 call SetColor('ColorColumn', '', '#1d0808', '', '', '') " Conceal " Cursor " CursorIM " CursorColumn -" hi! CursorLine guibg=#222222 term=none cterm=none gui=NONE -call SetColor('CursorLine', '', '#222222', '', '', '') -hi! Directory guifg=#eeeeee term=none cterm=none gui=NONE -hi! DiffAdd guifg=#aaaaaa guibg=#001000 term=none cterm=none gui=NONE -hi! DiffChange guifg=#777777 guibg=#101010 term=none cterm=none gui=NONE -hi! DiffDelete guifg=#333333 guibg=#200000 term=none cterm=none gui=NONE -hi! DiffText guifg=#cccccc guibg=#101010 term=none cterm=none gui=NONE -hi! EndOfBuffer guifg=#121212 guibg=NONE term=none cterm=none gui=NONE -hi! ErrorMsg guifg=#ff0000 guibg=NONE term=none cterm=none gui=NONE -hi! VertSplit guifg=#090909 guibg=#090909 term=none cterm=none gui=NONE -hi! Folded guifg=#666666 guibg=NONE term=none cterm=none gui=NONE -hi! FoldColumn guifg=#262626 guibg=#111111 term=none cterm=none gui=NONE -hi! SignColumn guifg=#eeeeee guibg=NONE term=none cterm=none gui=NONE -hi! LineNr guifg=#3a3a3a guibg=NONE term=none cterm=none gui=NONE -hi! CursorLineNr guifg=#767676 guibg=NONE term=none cterm=none gui=NONE -hi! MatchParen guifg=#ffffff guibg=#292929 term=none cterm=none gui=NONE -hi! ModeMsg guifg=#c6c6c6 guibg=NONE term=none cterm=none gui=NONE +call SetColor('CursorLine', '', '#222222', '', '#c1e7f4', '') +call SetColor('Directory', '#eeeeee', '', '', '', '') +call SetColor('DiffAdd', '#aaaaaa', '#001000', '', '', '') +call SetColor('DiffChange', '#777777', '#101010', '', '', '') +call SetColor('DiffDelete', '#333333', '#200000', '', '', '') +call SetColor('DiffText', '#cccccc', '#101010', '', '', '') +call SetColor('EndOfBuffer', '#121212', '', '#bbbbbb', '', '') +call SetColor('ErrorMsg', '#ff0000', '', '#222222', '#ffaaaa', '') +call SetColor('VertSplit', '#090909', '#090909', '#cccccc', '#cccccc', '') +call SetColor('Folded', '#666666', '', '#999999', '', '') +call SetColor('FoldColumn', '#262626', '#111111', '#aaaaaa', '', '') +call SetColor('SignColumn', '#eeeeee', '', '#555555', '', '') +call SetColor('LineNr', '#3a3a3a', '', '#999999', '', '') +call SetColor('CursorLineNr', '#767676', '', '#777777', '', '') +call SetColor('MatchParen', '#ffffff', '#292929', '#cccccc', '#666666', '') +call SetColor('ModeMsg', '#c6c6c6', '', '#333333', '', 'italic') -hi! MoreMsg guifg=#c6c6c6 guibg=NONE term=none cterm=none gui=NONE -hi! NonText guifg=#767676 guibg=NONE term=none cterm=none gui=NONE -hi! Pmenu guifg=#585858 guibg=#121212 term=none cterm=none gui=NONE -hi! PmenuSel guifg=#b2b2b2 guibg=#121212 term=none cterm=none gui=NONE +call SetColor('MoreMsg', '#c6c6c6', '', '', '', '') +call SetColor('NonText', '#767676', '', '', '', '') +call SetColor('Pmenu', '#585858', '#121212', '#666666', '#cccccc', '') +call SetColor('PmenuSel', '#b2b2b2', '#121212', '#333333', '#c7c7c7', '') " PmenuSbar " PmenuThumb -hi! Question guifg=#c6c6c6 guibg=NONE term=none cterm=none gui=NONE -hi! QuickFixLine guifg=#ff0000 guibg=NONE term=none cterm=none gui=NONE -hi! Search guifg=#ffffff guibg=NONE term=none cterm=none gui=NONE -hi! IncSearch guifg=#000000 guibg=#ffffff term=none cterm=none gui=NONE -hi! SpecialKey guifg=#eeeeee guibg=NONE term=none cterm=none gui=NONE -hi! SpellBad guifg=#aa0000 guibg=#220000 term=none cterm=none gui=NONE -hi! SpellCap guifg=#550000 guibg=#220000 term=none cterm=none gui=NONE +call SetColor('Question', '#c6c6c6', '', '', '', '') +call SetColor('QuickFixLine', '#ff0000', '', '', '', '') +call SetColor('Search', '#ffffff', '', '', '', '') +call SetColor('IncSearch', '#000000', '#ffffff', '', '', '') +call SetColor('SpecialKey', '#eeeeee', '', '', '', '') +call SetColor('SpellBad', '#aa0000', '#220000', '', '', '') +call SetColor('SpellCap', '#550000', '#220000', '', '', '') " SpellLocal " SpellRare -hi! TabLine guifg=#555555 guibg=#111111 term=italic cterm=italic gui=italic -hi! TabLineFill guifg=#eeeeee guibg=#111111 term=italic cterm=italic gui=italic -hi! TabLineSel guifg=#777777 guibg=#111111 term=italic cterm=italic gui=italic -hi! TabLineNoise guifg=#444444 guibg=#111111 term=italic cterm=italic gui=italic -hi! Title guifg=#a8a8a8 guibg=NONE term=bold cterm=bold gui=bold -hi! Visual guifg=#eeeeee guibg=#262626 term=bold cterm=bold gui=bold +call SetColor('TabLine', '#555555', '#111111', '', '', 'italic') +call SetColor('TabLineFill', '#eeeeee', '#111111', '', '', 'italic') +call SetColor('TabNumSel', '#777777', '#111111', '', '', 'italic') +call SetColor('TabLineNoise', '#444444', '#111111', '', '', 'italic') +call SetColor('Title', '#a8a8a8', 'none', '', '', 'bold') +call SetColor('Visual', '#eeeeee', '#262626', '', '', 'bold') " VisualNOS -hi! WarningMsg guifg=#ffffff guibg=NONE term=none cterm=none gui=NONE -hi! WildMenu guifg=#aaaaaa guibg=NONE term=none cterm=none gui=NONE +call SetColor('WarningMsg', '#ffffff', '', '', '', '') +call SetColor('WildMenu', '#aaaaaa', '', '', '', '') "}}} " GUI Interface groups @@ -85,10 +83,10 @@ hi! def link Delimiter Special hi! SpecialComment guifg=#555555 cterm=italic gui=italic hi! def link Debug Special -hi! Identifier guifg=#945f5d +call SetColor('Identifier', '#945f5d', '', '', '', '') hi! Function guifg=#945f5d cterm=bold gui=bold -hi! Type guifg=#663c3b +call SetColor('Type', '#663c3b', '', '', '', '') hi! StorageClass guifg=#472a29 cterm=bold gui=bold hi! def link Structure StorageClass hi! def link TypeDef StorageClass @@ -109,20 +107,20 @@ hi! Keyword guifg=#999999 cterm=bold gui=bold hi! Exception guifg=#666666 cterm=bold gui=bold hi! PreProc guifg=#363636 gui=bold cterm=bold -hi! Include guifg=#404040 +call SetColor('Include', '#404040', '', '', '', '') hi! def link Define PreProc hi! def link Macro PreProc hi! def link PreCondit PreProc hi! def link Todo SpecialComment -hi! Comment guifg=#383838 gui=italic cterm=italic +call SetColor('Comment', '#383838', '', '#9e9e9e', '', 'italic') hi! Underlined cterm=underline term=underline gui=underline hi! Ignore guifg=NONE -hi! Error guifg=#ee0000 cterm=bold gui=bold +call SetColor('Error', '#ee0000', '', '#cc0000', '', 'bold') hi! Noise guifg=#333333 @@ -131,13 +129,13 @@ hi! Noise guifg=#333333 "" #css, scss definitions "{{{ -hi! gSpecial guifg=#a1ccb7 cterm=bold gui=bold +hi! gSpecial guifg=#83a695 cterm=bold gui=bold hi! gIdentifier guifg=#5b6e5e cterm=bold gui=bold -hi! gFunction guifg=#5a635a -hi! gType guifg=#343d35 +call SetColor('gFunction', '#5a635a', '', '', '', '') +call SetColor('gType', '#343d35', '', '', '', '') -hi! cssClass guifg=#54b082 -hi! cssProp guifg=#555555 +call SetColor('cssClass', '#54b082', '', '', '', '') +call SetColor('cssProp', '#555555', '', '', '', '') hi! def link cssAttr String hi! def link cssIdentifierAttr Noise @@ -167,24 +165,24 @@ hi! def link vue_scss cssIdentifier ""{{{ -hi! bNormalBright guifg=#5f87af -hi! bNormal guifg=#5f5f87 +call SetColor('bNormalBright', '#5f87af', '', '', '', '') +call SetColor('bNormal', '#5f5f87', '', '', '', '') hi! bValueBrightItalic guifg=#bbbbdd cterm=italic gui=italic hi! bValueItalic guifg=#9999bb cterm=italic gui=italic -hi! bValue guifg=#9999bb +call SetColor('bValue', '#9999bb', '', '', '', '') hi! bValueDarkItalic guifg=#666688 cterm=italic gui=italic " values -hi! bSpecialBrighter guifg=#cec4ff -hi! bSpecialBright guifg=#b9afed -hi! bSpecial guifg=#8f88b8 -hi! bSpecialDark guifg=#615d7a +call SetColor('bSpecialBrighter', '#cec4ff', '', '', '', '') +call SetColor('bSpecialBright', '#b9afed', '', '', '', '') +call SetColor('bSpecial', '#8f88b8', '', '', '', '') +call SetColor('bSpecialDark', '#615d7a', '', '', '', '') " tags -hi! bKeywordBright guifg=#6c7bc2 -hi! bKeyword guifg=#505b8f -hi! bKeywordDark guifg=#373e61 +call SetColor('bKeywordBright', '#6c7bc2', '', '', '', '') +call SetColor('bKeyword', '#505b8f', '', '', '', '') +call SetColor('bKeywordDark', '#373e61', '', '', '', '') hi! def link htmlNormal Normal @@ -194,7 +192,7 @@ hi! def link htmlH1 htmlTitle hi! def link htmlTag Noise hi! def link htmlEndTag htmlTag hi! def link htmlArg PreProc -hi! htmlTagName guifg=#373e61 cterm=bold gui=bold +call SetColor('htmlTagName', '#373e61', '', '', '', '') hi! htmlSpecialTagName guifg=#505b8f cterm=bold gui=bold hi! def link htmlValue String hi! def link htmlSpecialChar Special @@ -235,9 +233,9 @@ hi! def link htmlHrefValue htmlSrcValue "" #vue definitions ""{{{ -hi! vueTagSpecial guifg=#bbbbdd -hi! vueComponentName guifg=#9999bb -hi! vueDynamicComponent guifg=#615d7a +call SetColor('vueTagSpecial', '#bbbbdd', '', '', '', '') +call SetColor('vueComponentName', '#9999bb', '', '', '', '') +call SetColor('vueDynamicComponent', '#615d7a', '', '', '', '') hi! def link vueTransitionComponent vueDynamicComponent hi! def link vueTransitionName cssIdentifier hi! def link vueTransitionMode String @@ -446,15 +444,22 @@ highlight def link TabLineItemSel String "" #gitgutter ""{{{ -hi! gitGutterAdd guifg=#344230 cterm=bold gui=bold -hi! GitGutterChange guifg=#483b2b cterm=bold gui=bold -hi! gitGutterDelete guifg=#582b2b cterm=bold gui=bold -hi! gitGutterChangeDelete guifg=#583b2b cterm=bold gui=bold +if &background ==? 'dark' + hi! gitGutterAdd guifg=#344230 cterm=bold gui=bold + hi! GitGutterChange guifg=#483b2b cterm=bold gui=bold + hi! gitGutterDelete guifg=#582b2b cterm=bold gui=bold + hi! gitGutterChangeDelete guifg=#583b2b cterm=bold gui=bold +else + hi! gitGutterAdd guifg=#788f71 cterm=bold gui=bold + hi! GitGutterChange guifg=#8f8671 cterm=bold gui=bold + hi! gitGutterDelete guifg=#8f7171 cterm=bold gui=bold + hi! gitGutterChangeDelete guifg=#8f755c cterm=bold gui=bold +endif -hi! def link GitGutterAdd mInterfaceAdd -hi! def link GitGutterChange mInterfaceModified -hi! def link GitGutterDelete mInterfaceDelete -hi! def link GitGutterChangeDelete mInterfaceDelete +" hi! def link GitGutterAdd mInterfaceAdd +" hi! def link GitGutterChange mInterfaceModified +" hi! def link GitGutterDelete mInterfaceDelete +" hi! def link GitGutterChangeDelete mInterfaceDelete ""}}}