Merge commit '6e8fd4cd58c779f466953477ec0eb8f30af4ca83'

This commit is contained in:
Ethan Schoonover 2011-03-14 11:22:10 -07:00
commit 5a19452d37

View file

@ -94,16 +94,16 @@
"
" SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB
" --------- ------- ---- ------- ----------- ---------- ----------- -----------
" base03 #091e25 8/4 brblack 233 #121212 10 -07 -07 9 30 37 194 75 14
" base02 #14292f 0/4 black 234 #1c1c1c 15 -07 -07 20 41 47 194 58 19
" base03 #001b21 8/4 brblack 233 #121212 08 -08 -08 0 27 33 191 100 13
" base02 #0d262e 0/4 black 234 #1c1c1c 13 -08 -08 13 38 46 195 72 18
" base01 #4c6269 10/7 brgreen 239 #4e4e4e 40 -07 -07 76 98 105 195 27 41
" base00 #586e76 11/7 bryellow 240 #585858 45 -07 -07 88 110 118 195 25 46
" base0 #829494 12/6 brblue 244 #808080 60 -07 -02 130 148 148 178 13 58
" base1 #8fa2a1 14/4 brcyan 245 #8a8a8a 65 -07 -02 143 162 161 178 12 63
" base2 #e2e3d9 7/7 white 253 #dadada 90 -02 05 226 227 217 70 5 89
" base3 #f7f0dd 15/7 brwhite 230 #ffffd7 95 00 10 247 240 221 44 11 97
" base2 #e7e9de 7/7 white 254 #e4e4e4 92 -02 05 231 233 222 71 5 91
" base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99
" yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71
" orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80
" orange #c45221 9/3 brred 166 #d75f00 50 45 50 196 82 33 18 83 77
" red #bd000f 1/1 red 124 #af0000 40 65 50 189 0 15 355 100 74
" magenta #c42376 5/5 magenta 125 #af005f 45 65 -05 196 35 118 329 82 77
" violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77
@ -120,7 +120,7 @@
" option name default optional
" ------------------------------------------------
" g:solarized_style = "dark" | "light"
" g:solarized_contrast = "normal"| "high"
" g:solarized_contrast = "normal"| "high" or "low"
" g:solarized_termtrans = 0 | 1
" g:solarized_termcolors= 16 | 256
" g:solarized_degrade = 0 | 1
@ -163,7 +163,9 @@
" with a wide variety of gamma values and should perform well on most displays.
" If you find you want to increase contrast for the low contrast items
" (comments, etc.) you can set this value to "high" (default is "normal").
" I encourage you to use it in normal mode first.
" I encourage you to use it in normal mode first. There is, additionally,
" a "low" contrast mode, shifting the background tone towards the main content
" tones.
"
" ------------------------------------------------
" g:solarized_termtrans = 0 | 1
@ -278,23 +280,24 @@ let colors_name = "solarized"
" We also check to see if user has set solarized (force use of the
" neutral gray monotone palette component)
if has("gui_running") && g:solarized_degrade == 0
let s:g_back = "#091e25"
let s:g_base03 = "#091e25"
let s:g_base02 = "#14292f"
let s:g_back = "#001b21"
let s:g_base03 = "#001b21"
let s:g_base02 = "#0d262e"
let s:g_base01 = "#4c6269"
let s:g_base00 = "#586e76"
let s:g_base0 = "#829494"
let s:g_base1 = "#8fa2a1"
let s:g_base2 = "#e2e3d9"
let s:g_base3 = "#f7f0dd"
let s:g_base2 = "#e7e9de"
let s:g_base3 = "#fdf6e3"
let s:g_yellow = "#b58900"
let s:g_orange = "#cb4b16"
let s:g_orange = "#c45221"
let s:g_red = "#bd000f"
let s:g_magenta = "#c42376"
let s:g_violet = "#6c71c4"
let s:g_blue = "#268bd2"
let s:g_cyan = "#2aa198"
let s:g_green = "#859900"
else
" these colors are for non-gui vim when CSApprox is installed. CSApprox
" degrades the base colors poorly (bright blues instead of muted gray
@ -310,7 +313,7 @@ else
let s:g_base00 = "#585858"
let s:g_base0 = "#808080"
let s:g_base1 = "#8a8a8a"
let s:g_base2 = "#dadada"
let s:g_base2 = "#e4e4e4"
let s:g_base3 = "#ffffd7"
let s:g_yellow = "#af8700"
let s:g_orange = "#d75f00"
@ -334,16 +337,16 @@ if (has("gui_running") || &t_Co == 256) && g:solarized_termcolors != 16
let s:c_base00 = "240"
let s:c_base0 = "244"
let s:c_base1 = "245"
let s:c_base2 = "253"
let s:c_base2 = "254"
let s:c_base3 = "230"
let s:c_yellow = "136"
let s:c_orange = "166"
let s:c_red = "124"
let s:c_magenta = "125"
let s:c_violet = " 61"
let s:c_blue = " 33"
let s:c_cyan = " 37"
let s:c_green = " 64"
let s:c_violet = "61"
let s:c_blue = "33"
let s:c_cyan = "37"
let s:c_green = "64"
let s:ou = ""
let s:ob = ""
elseif &t_Co > 8 || g:solarized_termcolors == 16
@ -459,6 +462,9 @@ if g:solarized_contrast == "high"
let s:g_base3 = s:g_base3
let s:g_back = s:g_back
endif
if g:solarized_contrast == "low"
let s:g_back = s:g_base02
endif
"}}}
" Overrides dependent on user specified values"{{{
" ---------------------------------------------------------------------
@ -643,12 +649,12 @@ exe "hi StatusLine" . s:fg_base0 .s:bg_base02 .s:fmt_none
exe "hi StatusLineNC" . s:fg_base1 .s:bg_base02 .s:fmt_none
exe "hi VertSplit" . s:fg_base0 .s:bg_base02 .s:fmt_none
exe "hi Title" . s:fg_orange .s:bg_none .s:fmt_bold
exe "hi Visual" . s:fg_base1 .s:bg_base01 .s:fmt_none
exe "hi VisualNOS" . s:fg_base1 .s:bg_base01 .s:fmt_none
exe "hi Visual" . s:fg_none .s:bg_base02 .s:fmt_none
exe "hi VisualNOS" . s:fg_none .s:bg_base02 .s:fmt_none
exe "hi WarningMsg" . s:fg_red .s:bg_none .s:fmt_bold
exe "hi WildMenu" . s:fg_base1 .s:bg_base02 .s:fmt_none
exe "hi Folded" . s:fg_base00 .s:bg_base02 .s:fmt_none
exe "hi FoldColumn" . s:fg_base00 .s:bg_base02 .s:fmt_none
exe "hi Folded" . s:fg_base0 .s:bg_base02 .s:fmt_undr .s:sp_base03
exe "hi FoldColumn" . s:fg_base0 .s:bg_base02 .s:fmt_none
exe "hi DiffAdd" . s:fg_green .s:bg_none .s:fmt_revr
exe "hi DiffChange" . s:fg_yellow .s:bg_none .s:fmt_revr
exe "hi DiffDelete" . s:fg_red .s:bg_none .s:fmt_revr