feat(palette): optimize diff colors

mimmanuel · Nov 23, 2020 · b0a8e37 · b0a8e37
1 parent f9bff48
commit b0a8e37
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
 
 - Remove duplicate docs in README.
 - Remove Anti-996-LICENSE.
+- Optimize diff colors.
 
 ### Fixed
 

diff --git a/autoload/edge.vim b/autoload/edge.vim
@@ -32,13 +32,13 @@ function! edge#get_palette(style) "{{{
             \ 'bg4':        ['#414550',   '238',  'Grey'],
             \ 'bg_grey':    ['#828a98',   '246',  'LightGrey'],
             \ 'bg_red':     ['#ec7279',   '203',  'Red'],
-            \ 'diff_red':   ['#473536',   '52',   'DarkRed'],
+            \ 'diff_red':   ['#55393d',   '52',   'DarkRed'],
             \ 'bg_green':   ['#a0c980',   '107',  'Green'],
-            \ 'diff_green': ['#384034',   '22',   'DarkGreen'],
+            \ 'diff_green': ['#394634',   '22',   'DarkGreen'],
             \ 'bg_blue':    ['#6cb6eb',   '110',  'Blue'],
-            \ 'diff_blue':  ['#323e47',   '17',   'DarkBlue'],
+            \ 'diff_blue':  ['#354157',   '17',   'DarkBlue'],
             \ 'bg_purple':  ['#d38aea',   '176',  'Magenta'],
-            \ 'diff_purple':['#433948',   '54',   'DarkMagenta'],
+            \ 'diff_yellow':['#4e432f',   '54',   'DarkMagenta'],
             \ 'fg':         ['#c5cdd9',   '250',  'White'],
             \ 'red':        ['#ec7279',   '203',  'Red'],
             \ 'yellow':     ['#deb974',   '179',  'Yellow'],
@@ -58,13 +58,13 @@ function! edge#get_palette(style) "{{{
             \ 'bg4':        ['#404455',   '238',  'Grey'],
             \ 'bg_grey':    ['#7e869b',   '246',  'LightGrey'],
             \ 'bg_red':     ['#ec7279',   '203',  'Red'],
-            \ 'diff_red':   ['#473536',   '52',   'DarkRed'],
+            \ 'diff_red':   ['#55393d',   '52',   'DarkRed'],
             \ 'bg_green':   ['#a0c980',   '107',  'Green'],
-            \ 'diff_green': ['#384034',   '22',   'DarkGreen'],
+            \ 'diff_green': ['#394634',   '22',   'DarkGreen'],
             \ 'bg_blue':    ['#6cb6eb',   '110',  'Blue'],
-            \ 'diff_blue':  ['#323e47',   '17',   'DarkBlue'],
+            \ 'diff_blue':  ['#354157',   '17',   'DarkBlue'],
             \ 'bg_purple':  ['#d38aea',   '176',  'Magenta'],
-            \ 'diff_purple':['#433948',   '54',   'DarkMagenta'],
+            \ 'diff_yellow':['#4e432f',   '54',   'DarkMagenta'],
             \ 'fg':         ['#c5cdd9',   '250',  'White'],
             \ 'red':        ['#ec7279',   '203',  'Red'],
             \ 'yellow':     ['#deb974',   '179',  'Yellow'],
@@ -84,13 +84,13 @@ function! edge#get_palette(style) "{{{
             \ 'bg4':        ['#3f445b',   '238',  'Grey'],
             \ 'bg_grey':    ['#7a819d',   '246',  'LightGrey'],
             \ 'bg_red':     ['#ec7279',   '203',  'Red'],
-            \ 'diff_red':   ['#473536',   '52',   'DarkRed'],
+            \ 'diff_red':   ['#55393d',   '52',   'DarkRed'],
             \ 'bg_green':   ['#a0c980',   '107',  'Green'],
-            \ 'diff_green': ['#384034',   '22',   'DarkGreen'],
+            \ 'diff_green': ['#394634',   '22',   'DarkGreen'],
             \ 'bg_blue':    ['#6cb6eb',   '110',  'Blue'],
-            \ 'diff_blue':  ['#323e47',   '17',   'DarkBlue'],
+            \ 'diff_blue':  ['#354157',   '17',   'DarkBlue'],
             \ 'bg_purple':  ['#d38aea',   '176',  'Magenta'],
-            \ 'diff_purple':['#433948',   '54',   'DarkMagenta'],
+            \ 'diff_yellow':['#4e432f',   '54',   'DarkMagenta'],
             \ 'fg':         ['#c5cdd9',   '250',  'White'],
             \ 'red':        ['#ec7279',   '203',  'Red'],
             \ 'yellow':     ['#deb974',   '179',  'Yellow'],
@@ -117,7 +117,7 @@ function! edge#get_palette(style) "{{{
           \ 'bg_blue':    ['#6996e0',   '68',   'Blue'],
           \ 'diff_blue':  ['#e3eaf6',   '153',  'LightBlue'],
           \ 'bg_purple':  ['#bf75d6',   '134',  'Magenta'],
-          \ 'diff_purple':['#f1e5f5',   '183',  'LightMagenta'],
+          \ 'diff_yellow':['#f0ece2',   '183',  'LightMagenta'],
           \ 'fg':         ['#4b505b',   '240',  'Black'],
           \ 'red':        ['#d05858',   '167',  'Red'],
           \ 'yellow':     ['#be7e05',   '172',  'Yellow'],

diff --git a/colors/edge.vim b/colors/edge.vim
@@ -21,7 +21,7 @@ endif
 let s:configuration = edge#get_configuration()
 let s:palette = edge#get_palette(s:configuration.style)
 let s:path = expand('<sfile>:p') " the path of this script
-let s:last_modified = 'Mon Nov 23 02:50:00 AM UTC 2020'
+let s:last_modified = 'Mon Nov 23 03:02:33 AM UTC 2020'
 let g:edge_loaded_file_types = []
 " }}}
 " Common Highlight Groups: {{{
@@ -240,10 +240,10 @@ else
   call edge#highlight('PurpleSign', s:palette.purple, s:palette.bg1)
 endif
 if s:configuration.diagnostic_line_highlight
-  call edge#highlight('ErrorLine', s:palette.bg0, s:palette.red)
-  call edge#highlight('WarningLine', s:palette.bg0, s:palette.yellow)
-  call edge#highlight('InfoLine', s:palette.bg0, s:palette.blue)
-  call edge#highlight('HintLine', s:palette.bg0, s:palette.green)
+  call edge#highlight('ErrorLine', s:palette.none, s:palette.diff_red)
+  call edge#highlight('WarningLine', s:palette.none, s:palette.diff_yellow)
+  call edge#highlight('InfoLine', s:palette.none, s:palette.diff_blue)
+  call edge#highlight('HintLine', s:palette.none, s:palette.diff_green)
 else
   highlight clear ErrorLine
   highlight clear WarningLine