From 6576d4b401b30cdf02289024774404ee09f675a6 Mon Sep 17 00:00:00 2001
From: Josh Dick <josh@joshdick.net>
Date: Wed, 11 May 2016 18:08:08 -0400
Subject: [PATCH] Fix last few rounds of incorrect color value changing, add
 s:menu_grey for use in menus and in airline-onedark.vim

---
 One Dark.itermcolors | 78 ++++++++++++++++++++++----------------------
 colors/onedark.vim   | 61 ++++++++++++++++++++++++++--------
 2 files changed, 87 insertions(+), 52 deletions(-)

diff --git a/One Dark.itermcolors b/One Dark.itermcolors
index f932b0a..6df1ca5 100644
--- a/One Dark.itermcolors	
+++ b/One Dark.itermcolors	
@@ -20,78 +20,78 @@
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.3765682578086853</real>
+		<real>0.38427835702896118</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.32725703716278076</real>
+		<real>0.33154332637786865</real>
 		<key>Red Component</key>
-		<real>0.84916031360626221</real>
+		<real>0.83982789516448975</real>
 	</dict>
 	<key>Ansi 10 Color</key>
 	<dict>
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.38414925336837769</real>
+		<real>0.39974293112754822</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.73151671886444092</real>
+		<real>0.72638434171676636</real>
 		<key>Red Component</key>
-		<real>0.52763903141021729</real>
+		<real>0.53152436017990112</real>
 	</dict>
 	<key>Ansi 11 Color</key>
 	<dict>
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.31264519691467285</real>
+		<real>0.32740181684494019</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.53874176740646362</real>
+		<real>0.53406417369842529</real>
 		<key>Red Component</key>
-		<real>0.77834683656692505</real>
+		<real>0.77367901802062988</real>
 	</dict>
 	<key>Ansi 12 Color</key>
 	<dict>
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.93489384651184082</real>
+		<real>0.92034518718719482</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.61235702037811279</real>
+		<real>0.61757242679595947</real>
 		<key>Red Component</key>
-		<real>0.30268973112106323</real>
+		<real>0.31691098213195801</real>
 	</dict>
 	<key>Ansi 13 Color</key>
 	<dict>
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.84389328956604004</real>
+		<real>0.83443140983581543</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.34964415431022644</real>
+		<real>0.36372148990631104</real>
 		<key>Red Component</key>
-		<real>0.72463274002075195</real>
+		<real>0.72034633159637451</real>
 	</dict>
 	<key>Ansi 14 Color</key>
 	<dict>
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.71362686157226562</real>
+		<real>0.70909905433654785</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.65958476066589355</real>
+		<real>0.65958327054977417</real>
 		<key>Red Component</key>
-		<real>0.2653622031211853</real>
+		<real>0.28184390068054199</real>
 	</dict>
 	<key>Ansi 15 Color</key>
 	<dict>
@@ -111,78 +111,78 @@
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.38414925336837769</real>
+		<real>0.39974293112754822</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.73151671886444092</real>
+		<real>0.72638434171676636</real>
 		<key>Red Component</key>
-		<real>0.52763903141021729</real>
+		<real>0.53152436017990112</real>
 	</dict>
 	<key>Ansi 3 Color</key>
 	<dict>
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.38895934820175171</real>
+		<real>0.40846776962280273</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.71021789312362671</real>
+		<real>0.70514953136444092</real>
 		<key>Red Component</key>
-		<real>0.87451928853988647</real>
+		<real>0.86970341205596924</real>
 	</dict>
 	<key>Ansi 4 Color</key>
 	<dict>
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.93489384651184082</real>
+		<real>0.92034518718719482</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.61235702037811279</real>
+		<real>0.61757242679595947</real>
 		<key>Red Component</key>
-		<real>0.30268973112106323</real>
+		<real>0.31691098213195801</real>
 	</dict>
 	<key>Ansi 5 Color</key>
 	<dict>
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.84389328956604004</real>
+		<real>0.83443140983581543</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.34964415431022644</real>
+		<real>0.36372148990631104</real>
 		<key>Red Component</key>
-		<real>0.72463274002075195</real>
+		<real>0.72034633159637451</real>
 	</dict>
 	<key>Ansi 6 Color</key>
 	<dict>
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.71362686157226562</real>
+		<real>0.70909905433654785</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.65958476066589355</real>
+		<real>0.65958327054977417</real>
 		<key>Red Component</key>
-		<real>0.2653622031211853</real>
+		<real>0.28184390068054199</real>
 	</dict>
 	<key>Ansi 7 Color</key>
 	<dict>
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.70040369033813477</real>
+		<real>0.69588643312454224</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.63625657558441162</real>
+		<real>0.63642364740371704</real>
 		<key>Red Component</key>
-		<real>0.60773354768753052</real>
+		<real>0.60774457454681396</real>
 	</dict>
 	<key>Ansi 8 Color</key>
 	<dict>
@@ -202,13 +202,13 @@
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.20353077352046967</real>
+		<real>0.21343094110488892</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.22815392911434174</real>
+		<real>0.23213338851928711</real>
 		<key>Red Component</key>
-		<real>0.69231098890304565</real>
+		<real>0.68343335390090942</real>
 	</dict>
 	<key>Background Color</key>
 	<dict>
diff --git a/colors/onedark.vim b/colors/onedark.vim
index bb83e29..447eb50 100644
--- a/colors/onedark.vim
+++ b/colors/onedark.vim
@@ -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.