mirror of
https://github.com/joshdick/onedark.vim.git
synced 2025-11-17 23:43:40 -05:00
Compare commits
2 Commits
main
...
5ba79152a0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5ba79152a0 | ||
|
|
bb1104653f |
@@ -9,6 +9,7 @@ if get(g:, 'onedark_termcolors', 256) == 16
|
||||
let s:term_red = s:colors.red.cterm16
|
||||
let s:term_green = s:colors.green.cterm16
|
||||
let s:term_yellow = s:colors.yellow.cterm16
|
||||
let s:term_dark_yellow = s:colors.dark_yellow.cterm16
|
||||
let s:term_blue = s:colors.blue.cterm16
|
||||
let s:term_purple = s:colors.purple.cterm16
|
||||
let s:term_white = s:colors.white.cterm16
|
||||
@@ -18,6 +19,7 @@ else
|
||||
let s:term_red = s:colors.red.cterm
|
||||
let s:term_green = s:colors.green.cterm
|
||||
let s:term_yellow = s:colors.yellow.cterm
|
||||
let s:term_dark_yellow = s:colors.dark_yellow.cterm
|
||||
let s:term_blue = s:colors.blue.cterm
|
||||
let s:term_purple = s:colors.purple.cterm
|
||||
let s:term_white = s:colors.white.cterm
|
||||
@@ -28,13 +30,14 @@ endif
|
||||
let s:red = [ s:colors.red.gui, s:term_red ]
|
||||
let s:green = [ s:colors.green.gui, s:term_green ]
|
||||
let s:yellow = [ s:colors.yellow.gui, s:term_yellow ]
|
||||
let s:dark_yellow = [ s:colors.dark_yellow.gui, s:term_dark_yellow ]
|
||||
let s:blue = [ s:colors.blue.gui, s:term_blue ]
|
||||
let s:purple = [ s:colors.purple.gui, s:term_purple ]
|
||||
let s:white = [ s:colors.white.gui, s:term_white ]
|
||||
let s:cursor_grey = [ s:colors.cursor_grey.gui, s:term_cursor_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': {}, 'command': {}}
|
||||
let s:p.normal.left = [ [ s:cursor_grey, s:green ], [ s:white, s:visual_grey ] ]
|
||||
let s:p.normal.right = [ [ s:cursor_grey, s:green ], [ s:white, s:visual_grey ] ]
|
||||
let s:p.inactive.left = [ [ s:white, s:visual_grey ], [ s:white, s:visual_grey ] ]
|
||||
@@ -53,6 +56,8 @@ let s:p.tabline.middle = [ [ s:white, s:cursor_grey ] ]
|
||||
let s:p.tabline.right = [ [ s:white, s:visual_grey ] ]
|
||||
let s:p.normal.error = [ [ s:cursor_grey, s:red ] ]
|
||||
let s:p.normal.warning = [ [ s:cursor_grey, s:yellow ] ]
|
||||
let s:p.command.left = [ [ s:cursor_grey, s:dark_yellow ], [ s:white, s:visual_grey ] ]
|
||||
let s:p.command.right = [ [ s:cursor_grey, s:dark_yellow ], [ s:white, s:visual_grey ] ]
|
||||
|
||||
let g:lightline#colorscheme#onedark#palette = lightline#colorscheme#flatten(s:p)
|
||||
|
||||
|
||||
@@ -162,12 +162,29 @@ let s:vertsplit = s:colors.vertsplit
|
||||
|
||||
" Terminal Colors {{{
|
||||
|
||||
if !has('nvim')
|
||||
if has('nvim')
|
||||
let g:terminal_color_0 = s:black.gui
|
||||
let g:terminal_color_1 = s:red.gui
|
||||
let g:terminal_color_2 = s:green.gui
|
||||
let g:terminal_color_3 = s:yellow.gui
|
||||
let g:terminal_color_4 = s:blue.gui
|
||||
let g:terminal_color_5 = s:purple.gui
|
||||
let g:terminal_color_6 = s:cyan.gui
|
||||
let g:terminal_color_7 = s:comment_grey.gui
|
||||
let g:terminal_color_8 = s:visual_grey.gui
|
||||
let g:terminal_color_9 = s:red.gui
|
||||
let g:terminal_color_10 = s:green.gui
|
||||
let g:terminal_color_11 = s:yellow.gui
|
||||
let g:terminal_color_12 = s:blue.gui
|
||||
let g:terminal_color_13 = s:purple.gui
|
||||
let g:terminal_color_14 = s:cyan.gui
|
||||
let g:terminal_color_15 = s:white.gui
|
||||
else
|
||||
let g:terminal_ansi_colors = [
|
||||
\ 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:visual_grey.gui, s:dark_red.gui, s:green.gui, s:dark_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:comment_grey.gui,
|
||||
\ s:visual_grey.gui, s:red.gui, s:green.gui, s:yellow.gui,
|
||||
\ s:blue.gui, s:purple.gui, s:cyan.gui, s:white.gui
|
||||
\]
|
||||
endif
|
||||
|
||||
|
||||
28
package-lock.json
generated
28
package-lock.json
generated
@@ -192,12 +192,12 @@
|
||||
}
|
||||
},
|
||||
"node_modules/braces": {
|
||||
"version": "3.0.3",
|
||||
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
|
||||
"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
|
||||
"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"fill-range": "^7.1.1"
|
||||
"fill-range": "^7.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
@@ -735,9 +735,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/fill-range": {
|
||||
"version": "7.1.1",
|
||||
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
|
||||
"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
|
||||
"version": "7.0.1",
|
||||
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
|
||||
"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"to-regex-range": "^5.0.1"
|
||||
@@ -2926,12 +2926,12 @@
|
||||
}
|
||||
},
|
||||
"braces": {
|
||||
"version": "3.0.3",
|
||||
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
|
||||
"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
|
||||
"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"fill-range": "^7.1.1"
|
||||
"fill-range": "^7.0.1"
|
||||
}
|
||||
},
|
||||
"buffer-from": {
|
||||
@@ -3333,9 +3333,9 @@
|
||||
}
|
||||
},
|
||||
"fill-range": {
|
||||
"version": "7.1.1",
|
||||
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
|
||||
"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
|
||||
"version": "7.0.1",
|
||||
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
|
||||
"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"to-regex-range": "^5.0.1"
|
||||
|
||||
Reference in New Issue
Block a user