m-vim_plugins/onedark.vim
1
0
Fork 0
mirror of https://github.com/joshdick/onedark.vim.git synced 2025-11-08 11:03:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Overhaul 16-color styling (#271)

Browse Source 
Includes regenerated terminal themes.
This commit is contained in:
Josh Dick
2021-07-11 20:00:38 -04:00
committed by GitHub
parent d954737e00
commit ad9610cdab
14 changed files with 148 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -6,6 +6,12 @@ A dark Vim/Neovim color scheme for the GUI and 16/256/true-color terminals, base
![Color Reference](https://raw.githubusercontent.com/joshdick/onedark.vim/master/img/color_reference.png) ![Color Reference](https://raw.githubusercontent.com/joshdick/onedark.vim/master/img/color_reference.png)
## Breaking Changes
[Pull request #271](https://github.com/joshdick/onedark.vim/pull/271), merged July 11, 2021, contained several breaking changes, especially for 16-color users.
If you are an existing onedark.vim user that is suddenly having issues after this PR was merged, see the [PR description](https://github.com/joshdick/onedark.vim/pull/271) for details.
## Supported Plugins ## Supported Plugins
onedark.vim includes support for the following Vim and Neovim plugins: onedark.vim includes support for the following Vim and Neovim plugins:

34
autoload/airline/themes/onedark.vim
View File

@@ -14,8 +14,8 @@ function! airline#themes#onedark#refresh()
let s:term_blue = s:colors.blue.cterm16 let s:term_blue = s:colors.blue.cterm16
let s:term_purple = s:colors.purple.cterm16 let s:term_purple = s:colors.purple.cterm16
let s:term_white = s:colors.white.cterm16 let s:term_white = s:colors.white.cterm16
let s:term_black = s:colors.black.cterm16 let s:term_cursor_grey = s:colors.cursor_grey.cterm16
let s:term_grey = s:colors.cursor_grey.cterm16 let s:term_visual_grey = s:colors.visual_grey.cterm16
else else
let s:term_red = s:colors.red.cterm let s:term_red = s:colors.red.cterm
let s:term_green = s:colors.green.cterm let s:term_green = s:colors.green.cterm
@@ -23,8 +23,8 @@ function! airline#themes#onedark#refresh()
let s:term_blue = s:colors.blue.cterm let s:term_blue = s:colors.blue.cterm
let s:term_purple = s:colors.purple.cterm let s:term_purple = s:colors.purple.cterm
let s:term_white = s:colors.white.cterm let s:term_white = s:colors.white.cterm
let s:term_black = s:colors.black.cterm let s:term_cursor_grey = s:colors.cursor_grey.cterm
let s:term_grey = s:colors.cursor_grey.cterm let s:term_visual_grey = s:colors.visual_grey.cterm
endif endif
let g:airline#themes#onedark#palette = {} let g:airline#themes#onedark#palette = {}
@@ -33,9 +33,9 @@ function! airline#themes#onedark#refresh()
\ 'red': [ s:colors.red.gui, '', s:term_red, 0 ] \ 'red': [ s:colors.red.gui, '', s:term_red, 0 ]
\ } \ }
let s:N1 = [ s:colors.black.gui, s:colors.green.gui, s:term_black, s:term_green ] let s:N1 = [ s:colors.cursor_grey.gui, s:colors.green.gui, s:term_cursor_grey, s:term_green ]
let s:N2 = [ s:colors.white.gui, s:colors.visual_grey.gui, s:term_white, s:term_grey ] let s:N2 = [ s:colors.white.gui, s:colors.visual_grey.gui, s:term_white, s:term_visual_grey ]
let s:N3 = [ s:colors.green.gui, s:colors.black.gui, s:term_green, '' ] let s:N3 = [ s:colors.green.gui, s:colors.cursor_grey.gui, s:term_green, s:term_cursor_grey ]
let g:airline#themes#onedark#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3) let g:airline#themes#onedark#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
let group = airline#themes#get_highlight('vimCommand') let group = airline#themes#get_highlight('vimCommand')
@@ -43,26 +43,26 @@ function! airline#themes#onedark#refresh()
\ 'airline_c': [ group[0], '', group[2], '', '' ] \ 'airline_c': [ group[0], '', group[2], '', '' ]
\ } \ }
let s:I1 = [ s:colors.black.gui, s:colors.blue.gui, s:term_black, s:term_blue ] let s:I1 = [ s:colors.cursor_grey.gui, s:colors.blue.gui, s:term_cursor_grey, s:term_blue ]
let s:I2 = s:N2 let s:I2 = s:N2
let s:I3 = [ s:colors.blue.gui, s:colors.black.gui, s:term_blue, '' ] let s:I3 = [ s:colors.blue.gui, s:colors.cursor_grey.gui, s:term_blue, '' ]
let g:airline#themes#onedark#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3) let g:airline#themes#onedark#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
let g:airline#themes#onedark#palette.insert_modified = g:airline#themes#onedark#palette.normal_modified let g:airline#themes#onedark#palette.insert_modified = g:airline#themes#onedark#palette.normal_modified
let s:R1 = [ s:colors.black.gui, s:colors.red.gui, s:term_black, s:term_red ] let s:R1 = [ s:colors.cursor_grey.gui, s:colors.red.gui, s:term_cursor_grey, s:term_red ]
let s:R2 = s:N2 let s:R2 = s:N2
let s:R3 = [ s:colors.red.gui, s:colors.black.gui, s:term_red, '' ] let s:R3 = [ s:colors.red.gui, s:colors.cursor_grey.gui, s:term_red, '' ]
let g:airline#themes#onedark#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3) let g:airline#themes#onedark#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
let g:airline#themes#onedark#palette.replace_modified = g:airline#themes#onedark#palette.normal_modified let g:airline#themes#onedark#palette.replace_modified = g:airline#themes#onedark#palette.normal_modified
let s:V1 = [ s:colors.black.gui, s:colors.purple.gui, s:term_black, s:term_purple ] let s:V1 = [ s:colors.cursor_grey.gui, s:colors.purple.gui, s:term_cursor_grey, s:term_purple ]
let s:V2 = s:N2 let s:V2 = s:N2
let s:V3 = [ s:colors.purple.gui, s:colors.black.gui, s:term_purple, '' ] let s:V3 = [ s:colors.purple.gui, s:colors.cursor_grey.gui, s:term_purple, '' ]
let g:airline#themes#onedark#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3) let g:airline#themes#onedark#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
let g:airline#themes#onedark#palette.visual_modified = g:airline#themes#onedark#palette.normal_modified let g:airline#themes#onedark#palette.visual_modified = g:airline#themes#onedark#palette.normal_modified
let s:IA1 = [ s:colors.black.gui, s:colors.white.gui, s:term_black, s:term_white ] let s:IA1 = [ s:colors.cursor_grey.gui, s:colors.white.gui, s:term_cursor_grey, s:term_white ]
let s:IA2 = [ s:colors.white.gui, s:colors.visual_grey.gui, s:term_white, s:term_grey ] let s:IA2 = [ s:colors.white.gui, s:colors.visual_grey.gui, s:term_white, s:term_visual_grey ]
let s:IA3 = s:N2 let s:IA3 = s:N2
let g:airline#themes#onedark#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3) let g:airline#themes#onedark#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
let g:airline#themes#onedark#palette.inactive_modified = { let g:airline#themes#onedark#palette.inactive_modified = {
@@ -72,7 +72,7 @@ function! airline#themes#onedark#refresh()
" Warning/Error styling code from vim-airline's ["base16" theme](https://github.com/vim-airline/vim-airline-themes/blob/master/autoload/airline/themes/base16.vim) " Warning/Error styling code from vim-airline's ["base16" theme](https://github.com/vim-airline/vim-airline-themes/blob/master/autoload/airline/themes/base16.vim)
" Warnings " Warnings
let s:WI = [ s:colors.black.gui, s:colors.yellow.gui, s:term_black, s:term_yellow ] let s:WI = [ s:colors.cursor_grey.gui, s:colors.yellow.gui, s:term_cursor_grey, s:term_yellow ]
let g:airline#themes#onedark#palette.normal.airline_warning = [ let g:airline#themes#onedark#palette.normal.airline_warning = [
\ s:WI[0], s:WI[1], s:WI[2], s:WI[3] \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
\ ] \ ]
@@ -99,7 +99,7 @@ function! airline#themes#onedark#refresh()
\ g:airline#themes#onedark#palette.normal.airline_warning \ g:airline#themes#onedark#palette.normal.airline_warning
" Errors " Errors
let s:ER = [ s:colors.black.gui, s:colors.red.gui, s:term_black, s:term_red ] let s:ER = [ s:colors.cursor_grey.gui, s:colors.red.gui, s:term_cursor_grey, s:term_red ]
let g:airline#themes#onedark#palette.normal.airline_error = [ let g:airline#themes#onedark#palette.normal.airline_error = [
\ s:ER[0], s:ER[1], s:ER[2], s:ER[3] \ s:ER[0], s:ER[1], s:ER[2], s:ER[3]
\ ] \ ]

48
autoload/lightline/colorscheme/onedark.vim
View File

@@ -12,8 +12,8 @@ if get(g:, 'onedark_termcolors', 256) == 16
let s:term_blue = s:colors.blue.cterm16 let s:term_blue = s:colors.blue.cterm16
let s:term_purple = s:colors.purple.cterm16 let s:term_purple = s:colors.purple.cterm16
let s:term_white = s:colors.white.cterm16 let s:term_white = s:colors.white.cterm16
let s:term_black = s:colors.black.cterm16 let s:term_cursor_grey = s:colors.cursor_grey.cterm16
let s:term_grey = s:colors.cursor_grey.cterm16 let s:term_visual_grey = s:colors.visual_grey.cterm16
else else
let s:term_red = s:colors.red.cterm let s:term_red = s:colors.red.cterm
let s:term_green = s:colors.green.cterm let s:term_green = s:colors.green.cterm
@@ -21,8 +21,8 @@ else
let s:term_blue = s:colors.blue.cterm let s:term_blue = s:colors.blue.cterm
let s:term_purple = s:colors.purple.cterm let s:term_purple = s:colors.purple.cterm
let s:term_white = s:colors.white.cterm let s:term_white = s:colors.white.cterm
let s:term_black = s:colors.black.cterm let s:term_cursor_grey = s:colors.cursor_grey.cterm
let s:term_grey = s:colors.cursor_grey.cterm let s:term_visual_grey = s:colors.visual_grey.cterm
endif endif
let s:red = [ s:colors.red.gui, s:term_red ] let s:red = [ s:colors.red.gui, s:term_red ]
@@ -31,28 +31,28 @@ let s:yellow = [ s:colors.yellow.gui, s:term_yellow ]
let s:blue = [ s:colors.blue.gui, s:term_blue ] let s:blue = [ s:colors.blue.gui, s:term_blue ]
let s:purple = [ s:colors.purple.gui, s:term_purple ] let s:purple = [ s:colors.purple.gui, s:term_purple ]
let s:white = [ s:colors.white.gui, s:term_white ] let s:white = [ s:colors.white.gui, s:term_white ]
let s:black = [ s:colors.black.gui, s:term_black ] let s:cursor_grey = [ s:colors.cursor_grey.gui, s:term_cursor_grey ]
let s:grey = [ s:colors.visual_grey.gui, s:term_grey ] let s:visual_grey = [ s:colors.visual_grey.gui, s:term_visual_grey ]
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
let s:p.normal.left = [ [ s:black, s:green ], [ s:white, s:grey ] ] let s:p.normal.left = [ [ s:cursor_grey, s:green ], [ s:white, s:visual_grey ] ]
let s:p.normal.right = [ [ s:black, s:green ], [ s:white, s:grey ] ] let s:p.normal.right = [ [ s:cursor_grey, s:green ], [ s:white, s:visual_grey ] ]
let s:p.inactive.left = [ [ s:white, s:grey ], [ s:white, s:grey ] ] let s:p.inactive.left = [ [ s:white, s:visual_grey ], [ s:white, s:visual_grey ] ]
let s:p.inactive.right = [ [ s:black, s:white ], [ s:black, s:white ] ] let s:p.inactive.right = [ [ s:cursor_grey, s:white ], [ s:cursor_grey, s:white ] ]
let s:p.insert.left = [ [ s:black, s:blue ], [ s:white, s:grey ] ] let s:p.insert.left = [ [ s:cursor_grey, s:blue ], [ s:white, s:visual_grey ] ]
let s:p.insert.right = [ [ s:black, s:blue ], [ s:white, s:grey ] ] let s:p.insert.right = [ [ s:cursor_grey, s:blue ], [ s:white, s:visual_grey ] ]
let s:p.replace.left = [ [ s:black, s:red ], [ s:white, s:grey ] ] let s:p.replace.left = [ [ s:cursor_grey, s:red ], [ s:white, s:visual_grey ] ]
let s:p.replace.right = [ [ s:black, s:red ], [ s:white, s:grey ] ] let s:p.replace.right = [ [ s:cursor_grey, s:red ], [ s:white, s:visual_grey ] ]
let s:p.visual.left = [ [ s:black, s:purple ], [ s:white, s:grey ] ] let s:p.visual.left = [ [ s:cursor_grey, s:purple ], [ s:white, s:visual_grey ] ]
let s:p.visual.right = [ [ s:black, s:purple ], [ s:white, s:grey ] ] let s:p.visual.right = [ [ s:cursor_grey, s:purple ], [ s:white, s:visual_grey ] ]
let s:p.normal.middle = [ [ s:white, s:black ] ] let s:p.normal.middle = [ [ s:white, s:cursor_grey ] ]
let s:p.inactive.middle = [ [ s:white, s:grey ] ] let s:p.inactive.middle = [ [ s:white, s:visual_grey ] ]
let s:p.tabline.left = [ [ s:white, s:grey ] ] let s:p.tabline.left = [ [ s:white, s:visual_grey ] ]
let s:p.tabline.tabsel = [ [ s:black, s:white ] ] let s:p.tabline.tabsel = [ [ s:cursor_grey, s:white ] ]
let s:p.tabline.middle = [ [ s:white, s:black ] ] let s:p.tabline.middle = [ [ s:white, s:cursor_grey ] ]
let s:p.tabline.right = [ [ s:white, s:grey ] ] let s:p.tabline.right = [ [ s:white, s:visual_grey ] ]
let s:p.normal.error = [ [ s:black, s:red ] ] let s:p.normal.error = [ [ s:cursor_grey, s:red ] ]
let s:p.normal.warning = [ [ s:black, s:yellow ] ] let s:p.normal.warning = [ [ s:cursor_grey, s:yellow ] ]
let g:lightline#colorscheme#onedark#palette = lightline#colorscheme#flatten(s:p) let g:lightline#colorscheme#onedark#palette = lightline#colorscheme#flatten(s:p)

19
autoload/onedark.vim
View File

@@ -11,16 +11,17 @@ let s:colors = {
\ "blue": get(s:overrides, "blue", { "gui": "#61AFEF", "cterm": "39", "cterm16": "4" }), \ "blue": get(s:overrides, "blue", { "gui": "#61AFEF", "cterm": "39", "cterm16": "4" }),
\ "purple": get(s:overrides, "purple", { "gui": "#C678DD", "cterm": "170", "cterm16": "5" }), \ "purple": get(s:overrides, "purple", { "gui": "#C678DD", "cterm": "170", "cterm16": "5" }),
\ "cyan": get(s:overrides, "cyan", { "gui": "#56B6C2", "cterm": "38", "cterm16": "6" }), \ "cyan": get(s:overrides, "cyan", { "gui": "#56B6C2", "cterm": "38", "cterm16": "6" }),
\ "white": get(s:overrides, "white", { "gui": "#ABB2BF", "cterm": "145", "cterm16": "7" }), \ "white": get(s:overrides, "white", { "gui": "#ABB2BF", "cterm": "145", "cterm16": "15" }),
\ "black": get(s:overrides, "black", { "gui": "#282C34", "cterm": "235", "cterm16": "0" }), \ "black": get(s:overrides, "black", { "gui": "#282C34", "cterm": "235", "cterm16": "0" }),
\ "visual_black": get(s:overrides, "visual_black", { "gui": "NONE", "cterm": "NONE", "cterm16": "0" }), \ "foreground": get(s:overrides, "foreground", { "gui": "#ABB2BF", "cterm": "145", "cterm16": "NONE" }),
\ "comment_grey": get(s:overrides, "comment_grey", { "gui": "#5C6370", "cterm": "59", "cterm16": "15" }), \ "background": get(s:overrides, "background", { "gui": "#282C34", "cterm": "235", "cterm16": "NONE" }),
\ "gutter_fg_grey": get(s:overrides, "gutter_fg_grey", { "gui": "#4B5263", "cterm": "238", "cterm16": "15" }), \ "comment_grey": get(s:overrides, "comment_grey", { "gui": "#5C6370", "cterm": "59", "cterm16": "7" }),
\ "cursor_grey": get(s:overrides, "cursor_grey", { "gui": "#2C323C", "cterm": "236", "cterm16": "8" }), \ "gutter_fg_grey": get(s:overrides, "gutter_fg_grey", { "gui": "#4B5263", "cterm": "238", "cterm16": "8" }),
\ "visual_grey": get(s:overrides, "visual_grey", { "gui": "#3E4452", "cterm": "237", "cterm16": "15" }), \ "cursor_grey": get(s:overrides, "cursor_grey", { "gui": "#2C323C", "cterm": "236", "cterm16": "0" }),
\ "menu_grey": get(s:overrides, "menu_grey", { "gui": "#3E4452", "cterm": "237", "cterm16": "8" }), \ "visual_grey": get(s:overrides, "visual_grey", { "gui": "#3E4452", "cterm": "237", "cterm16": "8" }),
\ "special_grey": get(s:overrides, "special_grey", { "gui": "#3B4048", "cterm": "238", "cterm16": "15" }), \ "menu_grey": get(s:overrides, "menu_grey", { "gui": "#3E4452", "cterm": "237", "cterm16": "7" }),
\ "vertsplit": get(s:overrides, "vertsplit", { "gui": "#181A1F", "cterm": "59", "cterm16": "15" }), \ "special_grey": get(s:overrides, "special_grey", { "gui": "#3B4048", "cterm": "238", "cterm16": "7" }),
\ "vertsplit": get(s:overrides, "vertsplit", { "gui": "#3E4452", "cterm": "59", "cterm16": "7" }),
\} \}
function! onedark#GetColors() function! onedark#GetColors()

16
build/build.js
View File

@@ -14,18 +14,18 @@ const baseColors = Object.freeze({
blue: { gui: '#61AFEF', cterm: '39', cterm16: '4' }, // alternate cterm: 75 blue: { gui: '#61AFEF', cterm: '39', cterm16: '4' }, // alternate cterm: 75
purple: { gui: '#C678DD', cterm: '170', cterm16: '5' }, // alternate cterm: 176 purple: { gui: '#C678DD', cterm: '170', cterm16: '5' }, // alternate cterm: 176
cyan: { gui: '#56B6C2', cterm: '38', cterm16: '6' }, // alternate cterm: 73 cyan: { gui: '#56B6C2', cterm: '38', cterm16: '6' }, // alternate cterm: 73
white: { gui: '#ABB2BF', cterm: '145', cterm16: '7' }, white: { gui: '#ABB2BF', cterm: '145', cterm16: '15' },
black: { gui: '#282C34', cterm: '235', cterm16: '0' } black: { gui: '#282C34', cterm: '235', cterm16: '0' }
}); });
const specialColors = Object.freeze({ const specialColors = Object.freeze({
comment_grey: { gui: '#5C6370', cterm: '59', cterm16: '15' }, comment_grey: { gui: '#5C6370', cterm: '59', cterm16: '7' },
gutter_fg_grey: { gui: '#4B5263', cterm: '238', cterm16: '15' }, gutter_fg_grey: { gui: '#4B5263', cterm: '238', cterm16: '8' },
cursor_grey: { gui: '#2C323C', cterm: '236', cterm16: '8' }, cursor_grey: { gui: '#2C323C', cterm: '236', cterm16: '0' },
visual_grey: { gui: '#3E4452', cterm: '237', cterm16: '15' }, visual_grey: { gui: '#3E4452', cterm: '237', cterm16: '8' },
menu_grey: { cterm16: '8' }, // vim theme handles gui/cterm values menu_grey: { cterm16: '7' }, // vim theme handles gui/cterm values
special_grey: { gui: '#3B4048', cterm: '238', cterm16: '15' }, special_grey: { gui: '#3B4048', cterm: '238', cterm16: '7' },
vertsplit: { gui: '#181A1F', cterm: '59', cterm16: '15' } vertsplit: { gui: '#3E4452', cterm: '59', cterm16: '7' }
}); });
const colors = Object.assign({}, baseColors, specialColors); const colors = Object.assign({}, baseColors, specialColors);

12
build/templates/One Dark.Xresources
View File

@@ -4,12 +4,12 @@
*.cursorColor: <%=white.gui%> *.cursorColor: <%=white.gui%>
! black ! black
*.color0: <%=comment_grey.gui%> *.color0: <%=cursor_grey.gui%>
*.color8: <%=gutter_fg_grey.gui%> *.color8: <%=visual_grey.gui%>
! red ! red
*.color1: <%=red.gui%> *.color1: <%=red.gui%>
*.color9: <%=dark_red.gui%> *.color9: <%=red.gui%>
! green ! green
*.color2: <%=green.gui%> *.color2: <%=green.gui%>
@@ -17,7 +17,7 @@
! yellow ! yellow
*.color3: <%=yellow.gui%> *.color3: <%=yellow.gui%>
*.color11: <%=dark_yellow.gui%> *.color11: <%=yellow.gui%>
! blue ! blue
*.color4: <%=blue.gui%> *.color4: <%=blue.gui%>
@@ -32,6 +32,6 @@
*.color14: <%=cyan.gui%> *.color14: <%=cyan.gui%>
! white ! white
*.color7: <%=white.gui%> *.color7: <%=comment_grey.gui%>
*.color15: <%=visual_grey.gui%> *.color15: <%=white.gui%>

3
build/templates/autoload.template.vim
View File

@@ -13,7 +13,8 @@ let s:colors = {
\ "cyan": get(s:overrides, "cyan", { "gui": "<%=cyan.gui%>", "cterm": "<%=cyan.cterm%>", "cterm16": "<%=cyan.cterm16%>" }), \ "cyan": get(s:overrides, "cyan", { "gui": "<%=cyan.gui%>", "cterm": "<%=cyan.cterm%>", "cterm16": "<%=cyan.cterm16%>" }),
\ "white": get(s:overrides, "white", { "gui": "<%=white.gui%>", "cterm": "<%=white.cterm%>", "cterm16": "<%=white.cterm16%>" }), \ "white": get(s:overrides, "white", { "gui": "<%=white.gui%>", "cterm": "<%=white.cterm%>", "cterm16": "<%=white.cterm16%>" }),
\ "black": get(s:overrides, "black", { "gui": "<%=black.gui%>", "cterm": "<%=black.cterm%>", "cterm16": "<%=black.cterm16%>" }), \ "black": get(s:overrides, "black", { "gui": "<%=black.gui%>", "cterm": "<%=black.cterm%>", "cterm16": "<%=black.cterm16%>" }),
\ "visual_black": get(s:overrides, "visual_black", { "gui": "NONE", "cterm": "NONE", "cterm16": "<%=black.cterm16%>" }), \ "foreground": get(s:overrides, "foreground", { "gui": "<%=white.gui%>", "cterm": "<%=white.cterm%>", "cterm16": "NONE" }),
\ "background": get(s:overrides, "background", { "gui": "<%=black.gui%>", "cterm": "<%=black.cterm%>", "cterm16": "NONE" }),
\ "comment_grey": get(s:overrides, "comment_grey", { "gui": "<%=comment_grey.gui%>", "cterm": "<%=comment_grey.cterm%>", "cterm16": "<%=comment_grey.cterm16%>" }), \ "comment_grey": get(s:overrides, "comment_grey", { "gui": "<%=comment_grey.gui%>", "cterm": "<%=comment_grey.cterm%>", "cterm16": "<%=comment_grey.cterm16%>" }),
\ "gutter_fg_grey": get(s:overrides, "gutter_fg_grey", { "gui": "<%=gutter_fg_grey.gui%>", "cterm": "<%=gutter_fg_grey.cterm%>", "cterm16": "<%=gutter_fg_grey.cterm16%>" }), \ "gutter_fg_grey": get(s:overrides, "gutter_fg_grey", { "gui": "<%=gutter_fg_grey.gui%>", "cterm": "<%=gutter_fg_grey.cterm%>", "cterm16": "<%=gutter_fg_grey.cterm16%>" }),
\ "cursor_grey": get(s:overrides, "cursor_grey", { "gui": "<%=cursor_grey.gui%>", "cterm": "<%=cursor_grey.cterm%>", "cterm16": "<%=cursor_grey.cterm16%>" }), \ "cursor_grey": get(s:overrides, "cursor_grey", { "gui": "<%=cursor_grey.gui%>", "cterm": "<%=cursor_grey.cterm%>", "cterm16": "<%=cursor_grey.cterm16%>" }),

23
colors/onedark.vim
View File

@@ -145,7 +145,8 @@ let s:purple = s:colors.purple
let s:cyan = s:colors.cyan let s:cyan = s:colors.cyan
let s:white = s:colors.white let s:white = s:colors.white
let s:black = s:colors.black let s:black = s:colors.black
let s:visual_black = s:colors.visual_black " Black out selected text in 16-color visual mode let s:foreground = s:colors.foreground
let s:background = s:colors.background
let s:comment_grey = s:colors.comment_grey let s:comment_grey = s:colors.comment_grey
let s:gutter_fg_grey = s:colors.gutter_fg_grey let s:gutter_fg_grey = s:colors.gutter_fg_grey
let s:cursor_grey = s:colors.cursor_grey let s:cursor_grey = s:colors.cursor_grey
@@ -160,9 +161,9 @@ let s:vertsplit = s:colors.vertsplit
let g:terminal_ansi_colors = [ let g:terminal_ansi_colors = [
\ s:black.gui, s:red.gui, s:green.gui, s:yellow.gui, \ s:black.gui, s:red.gui, s:green.gui, s:yellow.gui,
\ s:blue.gui, s:purple.gui, s:cyan.gui, s:white.gui, \ s:blue.gui, s:purple.gui, s:cyan.gui, s:comment_grey.gui,
\ s:visual_grey.gui, s:dark_red.gui, s:green.gui, s:dark_yellow.gui, \ s:visual_grey.gui, s:red.gui, s:green.gui, s:yellow.gui,
\ s:blue.gui, s:purple.gui, s:cyan.gui, s:comment_grey.gui \ s:blue.gui, s:purple.gui, s:cyan.gui, s:white.gui
\] \]
" }}} " }}}
@@ -240,10 +241,10 @@ call s:h("MatchParen", { "fg": s:blue, "gui": "underline", "cterm": "underline"
call s:h("ModeMsg", {}) " 'showmode' message (e.g., "-- INSERT --") call s:h("ModeMsg", {}) " 'showmode' message (e.g., "-- INSERT --")
call s:h("MoreMsg", {}) " more-prompt call s:h("MoreMsg", {}) " more-prompt
call s:h("NonText", { "fg": s:special_grey }) " '~' and '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). call s:h("NonText", { "fg": s:special_grey }) " '~' and '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line).
call s:h("Normal", { "fg": s:white, "bg": s:black }) " normal text call s:h("Normal", { "fg": s:foreground, "bg": s:background }) " normal text
call s:h("Pmenu", { "bg": s:menu_grey }) " Popup menu: normal item. call s:h("Pmenu", { "fg": s:white, "bg": s:menu_grey }) " Popup menu: normal item.
call s:h("PmenuSel", { "fg": s:black, "bg": s:blue }) " Popup menu: selected item. call s:h("PmenuSel", { "fg": s:cursor_grey, "bg": s:blue }) " Popup menu: selected item.
call s:h("PmenuSbar", { "bg": s:special_grey }) " Popup menu: scrollbar. call s:h("PmenuSbar", { "bg": s:cursor_grey }) " Popup menu: scrollbar.
call s:h("PmenuThumb", { "bg": s:white }) " Popup menu: Thumb of the scrollbar. call s:h("PmenuThumb", { "bg": s:white }) " Popup menu: Thumb of the scrollbar.
call s:h("Question", { "fg": s:purple }) " hit-enter prompt and yes/no questions call s:h("Question", { "fg": s:purple }) " hit-enter prompt and yes/no questions
call s:h("QuickFixLine", { "fg": s:black, "bg": s:yellow }) " Current quickfix item in the quickfix window. call s:h("QuickFixLine", { "fg": s:black, "bg": s:yellow }) " Current quickfix item in the quickfix window.
@@ -262,7 +263,7 @@ call s:h("TabLineFill", {}) " tab pages line, where there are no labels
call s:h("TabLineSel", { "fg": s:white }) " tab pages line, active tab page label call s:h("TabLineSel", { "fg": s:white }) " tab pages line, active tab page label
call s:h("Terminal", { "fg": s:white, "bg": s:black }) " terminal window (see terminal-size-color) call s:h("Terminal", { "fg": s:white, "bg": s:black }) " terminal window (see terminal-size-color)
call s:h("Title", { "fg": s:green }) " titles for output from ":set all", ":autocmd" etc. call s:h("Title", { "fg": s:green }) " titles for output from ":set all", ":autocmd" etc.
call s:h("Visual", { "fg": s:visual_black, "bg": s:visual_grey }) " Visual mode selection call s:h("Visual", { "bg": s:visual_grey }) " Visual mode selection
call s:h("VisualNOS", { "bg": s:visual_grey }) " Visual mode selection when vim is "Not Owning the Selection". Only X11 Gui's gui-x11 and xterm-clipboard supports this. call s:h("VisualNOS", { "bg": s:visual_grey }) " Visual mode selection when vim is "Not Owning the Selection". Only X11 Gui's gui-x11 and xterm-clipboard supports this.
call s:h("WarningMsg", { "fg": s:yellow }) " warning messages call s:h("WarningMsg", { "fg": s:yellow }) " warning messages
call s:h("WildMenu", { "fg": s:black, "bg": s:blue }) " current match in 'wildmenu' completion call s:h("WildMenu", { "fg": s:black, "bg": s:blue }) " current match in 'wildmenu' completion
@@ -644,8 +645,8 @@ if has("nvim")
let g:terminal_color_13 = s:purple.gui " No dark version let g:terminal_color_13 = s:purple.gui " No dark version
let g:terminal_color_14 = s:cyan.gui " No dark version let g:terminal_color_14 = s:cyan.gui " No dark version
let g:terminal_color_15 = s:comment_grey.gui let g:terminal_color_15 = s:comment_grey.gui
let g:terminal_color_background = g:terminal_color_0 let g:terminal_color_background = s:background.gui
let g:terminal_color_foreground = g:terminal_color_7 let g:terminal_color_foreground = s:foreground.gui
" }}} " }}}
" Neovim LSP {{{ " Neovim LSP {{{

12
term/One Dark.Xresources
View File

@@ -4,12 +4,12 @@
*.cursorColor: #ABB2BF *.cursorColor: #ABB2BF
! black ! black
*.color0: #5C6370 *.color0: #2C323C
*.color8: #4B5263 *.color8: #3E4452
! red ! red
*.color1: #E06C75 *.color1: #E06C75
*.color9: #BE5046 *.color9: #E06C75
! green ! green
*.color2: #98C379 *.color2: #98C379
@@ -17,7 +17,7 @@
! yellow ! yellow
*.color3: #E5C07B *.color3: #E5C07B
*.color11: #D19A66 *.color11: #E5C07B
! blue ! blue
*.color4: #61AFEF *.color4: #61AFEF
@@ -32,6 +32,6 @@
*.color14: #56B6C2 *.color14: #56B6C2
! white ! white
*.color7: #ABB2BF *.color7: #5C6370
*.color15: #3E4452 *.color15: #ABB2BF

28
term/One Dark.alacritty
View File

@@ -7,12 +7,23 @@ colors:
# Cursor colors # Cursor colors
cursor: cursor:
text: '0x5c6370' text: '0x2c323c'
cursor: '0xabb2bf' cursor: '0x5c6370'
# Normal colors # Normal colors
normal: normal:
black: '0x5c6370' black: '0x2c323c'
red: '0xe06c75'
green: '0x98c379'
yellow: '0xe5c07b'
blue: '0x61afef'
magenta: '0xc678dd'
cyan: '0x56b6c2'
white: '0x5c6370'
# Bright colors
bright:
black: '0x3e4452'
red: '0xe06c75' red: '0xe06c75'
green: '0x98c379' green: '0x98c379'
yellow: '0xe5c07b' yellow: '0xe5c07b'
@@ -21,14 +32,3 @@ colors:
cyan: '0x56b6c2' cyan: '0x56b6c2'
white: '0xabb2bf' white: '0xabb2bf'
# Bright colors
bright:
black: '0x4b5263'
red: '0xbe5046'
green: '0x98c379'
yellow: '0xd19a66'
blue: '0x61afef'
magenta: '0xc678dd'
cyan: '0x56b6c2'
white: '0x3e4452'

16
term/One Dark.colorscheme
View File

@@ -8,13 +8,13 @@ Color=40,44,52
Color=40,44,52 Color=40,44,52
[Color0] [Color0]
Color=92,99,112 Color=44,50,60
[Color0Faint] [Color0Faint]
Color=92,99,112 Color=44,50,60
[Color0Intense] [Color0Intense]
Color=75,82,99 Color=62,68,82
[Color1] [Color1]
Color=224,108,117 Color=224,108,117
@@ -23,7 +23,7 @@ Color=224,108,117
Color=224,108,117 Color=224,108,117
[Color1Intense] [Color1Intense]
Color=190,80,70 Color=224,108,117
[Color2] [Color2]
Color=152,195,121 Color=152,195,121
@@ -41,7 +41,7 @@ Color=229,192,123
Color=229,192,123 Color=229,192,123
[Color3Intense] [Color3Intense]
Color=209,154,102 Color=229,192,123
[Color4] [Color4]
Color=97,175,239 Color=97,175,239
@@ -71,13 +71,13 @@ Color=86,182,194
Color=86,182,194 Color=86,182,194
[Color7] [Color7]
Color=171,178,191 Color=92,99,112
[Color7Faint] [Color7Faint]
Color=171,178,191 Color=92,99,112
[Color7Intense] [Color7Intense]
Color=62,68,82 Color=171,178,191
[Foreground] [Foreground]
Color=171,178,191 Color=171,178,191

36
term/One Dark.itermcolors
View File

@@ -7,11 +7,11 @@
<key>Color Space</key> <key>Color Space</key>
<string>sRGB</string> <string>sRGB</string>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.4392156862745098</real> <real>0.23529411764705882</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.38823529411764707</real> <real>0.19607843137254902</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.3607843137254902</real> <real>0.17254901960784313</real>
</dict> </dict>
<key>Ansi 1 Color</key> <key>Ansi 1 Color</key>
<dict> <dict>
@@ -40,11 +40,11 @@
<key>Color Space</key> <key>Color Space</key>
<string>sRGB</string> <string>sRGB</string>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.4</real> <real>0.4823529411764706</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.6039215686274509</real> <real>0.7529411764705882</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.8196078431372549</real> <real>0.8980392156862745</real>
</dict> </dict>
<key>Ansi 12 Color</key> <key>Ansi 12 Color</key>
<dict> <dict>
@@ -84,11 +84,11 @@
<key>Color Space</key> <key>Color Space</key>
<string>sRGB</string> <string>sRGB</string>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.3215686274509804</real> <real>0.7490196078431373</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.26666666666666666</real> <real>0.6980392156862745</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.24313725490196078</real> <real>0.6705882352941176</real>
</dict> </dict>
<key>Ansi 2 Color</key> <key>Ansi 2 Color</key>
<dict> <dict>
@@ -150,33 +150,33 @@
<key>Color Space</key> <key>Color Space</key>
<string>sRGB</string> <string>sRGB</string>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.7490196078431373</real> <real>0.4392156862745098</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.6980392156862745</real> <real>0.38823529411764707</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.6705882352941176</real> <real>0.3607843137254902</real>
</dict> </dict>
<key>Ansi 8 Color</key> <key>Ansi 8 Color</key>
<dict> <dict>
<key>Color Space</key> <key>Color Space</key>
<string>sRGB</string> <string>sRGB</string>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.38823529411764707</real>
<key>Green Component</key>
<real>0.3215686274509804</real> <real>0.3215686274509804</real>
<key>Green Component</key>
<real>0.26666666666666666</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.29411764705882354</real> <real>0.24313725490196078</real>
</dict> </dict>
<key>Ansi 9 Color</key> <key>Ansi 9 Color</key>
<dict> <dict>
<key>Color Space</key> <key>Color Space</key>
<string>sRGB</string> <string>sRGB</string>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.27450980392156865</real> <real>0.4588235294117647</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.3137254901960784</real> <real>0.4235294117647059</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.7450980392156863</real> <real>0.8784313725490196</real>
</dict> </dict>
<key>Background Color</key> <key>Background Color</key>
<dict> <dict>

20
term/One Dark.kitty
View File

@@ -1,20 +1,20 @@
# Cursor # Cursor
cursor #abb2bf cursor #5c6370
cursor_text_color #5c6370 cursor_text_color #2c323c
# Special # Special
foreground #abb2bf foreground #abb2bf
background #282c34 background #282c34
selection_foreground #5c6370 selection_foreground #2c323c
selection_background #abb2bf selection_background #5c6370
# Black # Black
color0 #5c6370 color0 #2c323c
color8 #4b5263 color8 #3e4452
# Red # Red
color1 #e06c75 color1 #e06c75
color9 #be5046 color9 #e06c75
# Green # Green
color2 #98c379 color2 #98c379
@@ -22,7 +22,7 @@ color10 #98c379
# Yellow # Yellow
color3 #e5c07b color3 #e5c07b
color11 #d19a66 color11 #e5c07b
# Blue # Blue
color4 #61afef color4 #61afef
@@ -37,5 +37,5 @@ color6 #56b6c2
color14 #56b6c2 color14 #56b6c2
# White # White
color7 #abb2bf color7 #5c6370
color15 #3e4452 color15 #abb2bf

14
term/One Dark.terminal
View File

@@ -6,7 +6,7 @@
<data> <data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjM2MDc4NDMxMzcgMC4zODgyMzUyOTQxIDAuNDM5MjE1Njg2MwAQAYAC0hAREhNaJGNs LjE3MjU0OTAxOTYgMC4xOTYwNzg0MzE0IDAuMjM1Mjk0MTE3NgAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q== AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -24,7 +24,7 @@
<data> <data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjI5NDExNzY0NzEgMC4zMjE1Njg2Mjc1IDAuMzg4MjM1Mjk0MQAQAYAC0hAREhNaJGNs LjI0MzEzNzI1NDkgMC4yNjY2NjY2NjY3IDAuMzIxNTY4NjI3NQAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q== AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -69,7 +69,7 @@
<data> <data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
Ljc0NTA5ODAzOTIgMC4zMTM3MjU0OTAyIDAuMjc0NTA5ODAzOQAQAYAC0hAREhNaJGNs Ljg3ODQzMTM3MjUgMC40MjM1Mjk0MTE4IDAuNDU4ODIzNTI5NAAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q== AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -78,7 +78,7 @@
<data> <data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjI0MzEzNzI1NDkgMC4yNjY2NjY2NjY3IDAuMzIxNTY4NjI3NQAQAYAC0hAREhNaJGNs LjY3MDU4ODIzNTMgMC42OTgwMzkyMTU3IDAuNzQ5MDE5NjA3OAAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q== AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -87,7 +87,7 @@
<data> <data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjgxOTYwNzg0MzEgMC42MDM5MjE1Njg2IDAuNDAwMDAwMDAwMAAQAYAC0hAREhNaJGNs Ljg5ODAzOTIxNTcgMC43NTI5NDExNzY1IDAuNDgyMzUyOTQxMgAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q== AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -132,7 +132,7 @@
<data> <data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjY3MDU4ODIzNTMgMC42OTgwMzkyMTU3IDAuNzQ5MDE5NjA3OAAQAYAC0hAREhNaJGNs LjM2MDc4NDMxMzcgMC4zODgyMzUyOTQxIDAuNDM5MjE1Njg2MwAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q== AAAZAAAAAAAAAAAAAAAAAAAA2Q==
@@ -168,7 +168,7 @@
<data> <data>
YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw AAGGoKMHCA9VJG51bGzTCQoLDA0OVU5TUkdCXE5TQ29sb3JTcGFjZVYkY2xhc3NPECcw
LjI0MzEzNzI1NDkgMC4yNjY2NjY2NjY3IDAuMzIxNTY4NjI3NQAQAYAC0hAREhNaJGNs LjY3MDU4ODIzNTMgMC42OTgwMzkyMTU3IDAuNzQ5MDE5NjA3OAAQAYAC0hAREhNaJGNs
YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhOW2KMjpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
AAAZAAAAAAAAAAAAAAAAAAAA2Q== AAAZAAAAAAAAAAAAAAAAAAAA2Q==