Fix last few rounds of incorrect color value changing, add s:menu_grey for use in menus and in airline-onedark.vim

This commit is contained in:
Josh Dick
2016-05-11 18:08:08 -04:00
parent d1c4e8e6d1
commit 6576d4b401
2 changed files with 87 additions and 52 deletions

View File

@@ -6,6 +6,40 @@
" A companion [vim-airline](https://github.com/bling/vim-airline) theme is available at: https://github.com/joshdick/airline-onedark.vim
" +-----------------+
" | Color Reference |
" +-----------------+
" The following colors were measured inside Atom using its built-in inspector.
" +---------------------------------------------+
" | Color Name | RGB | Hex |
" |--------------+--------------------+---------|
" | Black | rgb(40, 44, 52) | #282c34 |
" |--------------+--------------------+---------|
" | White | rgb(171, 178, 191) | #abb2bf |
" |--------------+--------------------+---------|
" | Light Red | rgb(224, 108, 117) | #e06c75 |
" |--------------+--------------------+---------|
" | Dark Red | rgb(190, 80, 70) | #be5046 |
" |--------------+--------------------+---------|
" | Green | rgb(152, 195, 121) | #98c379 |
" |--------------+--------------------+---------|
" | Light Yellow | rgb(229, 192, 123) | #e5c07b |
" |--------------+--------------------+---------|
" | Dark Yellow | rgb(209, 154, 102) | #d19a66 |
" |--------------+--------------------+---------|
" | Blue | rgb(97, 175, 239) | #61afef |
" |--------------+--------------------+---------|
" | Magenta | rgb(198, 120, 221) | #c678dd |
" |--------------+--------------------+---------|
" | Cyan | rgb(86, 182, 194) | #56b6c2 |
" |--------------+--------------------+---------|
" | Gutter Grey | rgb(99, 109, 131) | #636d83 |
" |--------------+--------------------+---------|
" | Comment Grey | rgb(92, 99, 112) | #5c6370 |
" +---------------------------------------------+
" +----------------+
" | Initialization |
" +----------------+
@@ -59,29 +93,30 @@ endfunction
" | Color Variables |
" +-----------------+
let s:red = { "gui": "#E26B73", "cterm": "204", "cterm16": "1" } " Alternate cterm: 168
let s:dark_red = { "gui": "#C04F43", "cterm": "196", "cterm16": "9" }
let s:red = { "gui": "#E06C75", "cterm": "204", "cterm16": "1" } " Alternate cterm: 168
let s:dark_red = { "gui": "#BE5046", "cterm": "196", "cterm16": "9" }
let s:green = { "gui": "#97C475", "cterm": "114", "cterm16": "2" }
let s:green = { "gui": "#98C379", "cterm": "114", "cterm16": "2" }
let s:yellow = { "gui": "#E6C176", "cterm": "180", "cterm16": "3" }
let s:dark_yellow = { "gui": "#D29B62", "cterm": "173", "cterm16": "11" }
let s:yellow = { "gui": "#E5C07b", "cterm": "180", "cterm16": "3" }
let s:dark_yellow = { "gui": "#D19A66", "cterm": "173", "cterm16": "11" }
let s:blue = { "gui": "#5DAEF2", "cterm": "39", "cterm16": "4" } " Alternate cterm: 75
let s:blue = { "gui": "#61AFEF", "cterm": "39", "cterm16": "4" } " Alternate cterm: 75
let s:purple = { "gui": "#C775DF", "cterm": "170", "cterm16": "5" } " Alternate cterm: 176
let s:purple = { "gui": "#C678DD", "cterm": "170", "cterm16": "5" } " Alternate cterm: 176
let s:cyan = { "gui": "#51B6C3", "cterm": "38", "cterm16": "6" } " Alternate cterm: 73
let s:cyan = { "gui": "#56B6C2", "cterm": "38", "cterm16": "6" } " Alternate cterm: 73
let s:white = { "gui": "#ABB2C0", "cterm": "145", "cterm16" : "7" }
let s:white = { "gui": "#ABB2BF", "cterm": "145", "cterm16" : "7" }
let s:black = { "gui": "#282C34", "cterm": "235", "cterm16": "0" }
let s:visual_black = { "gui": "NONE", "cterm": "NONE", "cterm16": s:black.cterm16 } " Black out selected text in 16-color visual mode
let s:comment_grey = { "gui": "#5C6371", "cterm": "59", "cterm16": "15" }
let s:gutter_fg_grey = { "gui": "#4B5264", "cterm": "238", "cterm16": "15" }
let s:comment_grey = { "gui": "#5C6370", "cterm": "59", "cterm16": "15" }
let s:gutter_fg_grey = { "gui": "#636D83", "cterm": "238", "cterm16": "15" }
let s:cursor_grey = { "gui": "#2C323C", "cterm": "236", "cterm16": "8" }
let s:visual_grey = { "gui": "#3E4452", "cterm": "237", "cterm16": "15" }
let s:menu_grey = { "gui": s:visual_grey.gui, "cterm": s:visual_grey.cterm, "cterm16": "8" }
let s:special_grey = { "gui": "#3B4048", "cterm": "238", "cterm16": "15" }
let s:vertsplit = { "gui": "#181A1F", "cterm": "59", "cterm16": "15" }
@@ -154,8 +189,8 @@ 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("Normal", { "fg": s:white, "bg": s:black }) " normal text
call s:h("Pmenu", {}) " Popup menu: normal item.
call s:h("PmenuSel", { "bg": s:visual_grey }) " Popup menu: selected item.
call s:h("PmenuSbar", { "bg": s:visual_grey }) " Popup menu: scrollbar.
call s:h("PmenuSel", { "bg": s:menu_grey }) " Popup menu: selected item.
call s:h("PmenuSbar", { "bg": s:menu_grey }) " Popup menu: 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("Search", { "fg": s:visual_black, "bg": s:visual_grey }) " Last search pattern highlighting (see 'hlsearch'). Also used for highlighting the current line in the quickfix window and similar items that need to stand out.