aboutsummaryrefslogtreecommitdiffstats
path: root/colors
diff options
context:
space:
mode:
Diffstat (limited to 'colors')
-rw-r--r--colors/solarized.vim67
1 files changed, 35 insertions, 32 deletions
diff --git a/colors/solarized.vim b/colors/solarized.vim
index b9feece..14e43f1 100644
--- a/colors/solarized.vim
+++ b/colors/solarized.vim
@@ -94,18 +94,18 @@
"
" SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB
" --------- ------- ---- ------- ----------- ---------- ----------- -----------
-" 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
+" base03 #052a32 8/4 brblack 234 #1c1c1c 15 -11 -09 5 42 50 191 90 20
+" base02 #12353d 0/4 black 235 #262626 20 -11 -09 18 53 61 191 71 24
+" base01 #517077 10/7 brgreen 240 #585858 45 -10 -08 81 112 119 192 32 47
+" base00 #617c82 11/7 bryellow 241 #626262 50 -09 -07 97 124 130 192 26 51
+" base0 #809599 12/6 brblue 244 #808080 60 -07 -05 128 149 153 190 17 60
+" base1 #8fa1a5 14/4 brcyan 245 #8a8a8a 65 -06 -04 143 161 165 189 13 65
" base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93
" 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 #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
+" red #cd1e1a 1/1 red 124 #af0000 45 65 50 205 30 26 1 87 80
+" magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83
" violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77
" blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82
" cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63
@@ -280,24 +280,26 @@ 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 = "#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_back = "#052a32"
+ let s:g_base03 = "#052a32"
+ let s:g_base02 = "#12353d"
+ let s:g_base01 = "#517077"
+ let s:g_base00 = "#617c82"
+ let s:g_base0 = "#809599"
+ let s:g_base1 = "#8fa1a5"
let s:g_base2 = "#eee8d5"
let s:g_base3 = "#fdf6e3"
let s:g_yellow = "#b58900"
let s:g_orange = "#c45221"
- let s:g_red = "#bd000f"
- let s:g_magenta = "#c42376"
+ let s:g_red = "#cd1e1a"
+ let s:g_magenta = "#d33682"
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
@@ -654,7 +656,7 @@ exe "hi VisualNOS" . s:fg_none .s:bg_base02 .s:fmt_stnd
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_base0 .s:bg_base02 .s:fmt_undr .s:sp_base03
-exe "hi FoldColumn" . s:fg_base0 .s:bg_base02 .s:fmt_none
+exe "hi FoldColumn" . s:fg_base0 .s:bg_base02 .s:fmt_bold
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
@@ -697,14 +699,14 @@ exe "hi MatchParen" . s:fg_red .s:bg_base01 .s:fmt_bold
"}}}
" html highlighting "{{{
" ---------------------------------------------------------------------
-"exe "hi htmlTag" . s:fg_red .s:bg_none .s:fmt_none
-"exe "hi htmlTagN" . s:fg_red .s:bg_none .s:fmt_none
-"exe "hi htmlTagName" . s:fg_red .s:bg_none .s:fmt_none
-"exe "hi htmlEndTag" . s:fg_red .s:bg_none .s:fmt_none
+exe "hi htmlTag" . s:fg_red .s:bg_none .s:fmt_none
+exe "hi htmlTagN" . s:fg_red .s:bg_none .s:fmt_none
+exe "hi htmlTagName" . s:fg_red .s:bg_none .s:fmt_none
+exe "hi htmlEndTag" . s:fg_red .s:bg_none .s:fmt_none
"}}}
" perl highlighting "{{{
" ---------------------------------------------------------------------
-"exe "hi perlHereDoc" . s:fg_base1 .s:bg_back .s:fmt_none
+exe "hi perlHereDoc" . s:fg_base1 .s:bg_back .s:fmt_none
"}}}
" haskell syntax highlighting"{{{
" ---------------------------------------------------------------------
@@ -765,9 +767,9 @@ exe "hi pandocListReference" .s:fg_magenta.s:bg_none .s:fmt_undr
" Definitions
" ---------------------------------------------------------------------
-let s:fg_pdef = s:fg_cyan
+let s:fg_pdef = s:fg_violet
exe "hi pandocDefinitionBlock" .s:fg_pdef .s:bg_none .s:fmt_none
-exe "hi pandocDefinitionTerm" .s:fg_pdef .s:bg_none .s:fmt_bold
+exe "hi pandocDefinitionTerm" .s:fg_pdef .s:bg_none .s:fmt_stnd
exe "hi pandocDefinitionIndctr" .s:fg_pdef .s:bg_none .s:fmt_bold
exe "hi pandocEmphasisDefinition" .s:fg_pdef .s:bg_none .s:fmt_ital
exe "hi pandocEmphasisNestedDefinition" .s:fg_pdef .s:bg_none .s:fmt_bldi
@@ -782,8 +784,8 @@ exe "hi pandocSubscriptDefinition" .s:fg_pdef .s:bg_none .s:fmt_none
" Tables
" ---------------------------------------------------------------------
let s:fg_ptable = s:fg_blue
-exe "hi pandocTable" .s:fg_ptable.s:bg_base03.s:fmt_none
-exe "hi pandocTableStructure" .s:fg_ptable.s:bg_base03.s:fmt_none
+exe "hi pandocTable" .s:fg_ptable.s:bg_none .s:fmt_none
+exe "hi pandocTableStructure" .s:fg_ptable.s:bg_none .s:fmt_none
hi link pandocTableStructureTop pandocTableStructre
hi link pandocTableStructureEnd pandocTableStructre
exe "hi pandocTableZebraLight" .s:fg_ptable.s:bg_base03.s:fmt_none
@@ -800,9 +802,9 @@ exe "hi pandocSubscriptTable" .s:fg_ptable.s:bg_none .s:fmt_none
" Headings
" ---------------------------------------------------------------------
-let s:fg_phead = s:fg_orange
+let s:fg_phead = s:fg_magenta
exe "hi pandocHeading" .s:fg_phead .s:bg_none.s:fmt_bold
-exe "hi pandocHeadingMarker" .s:fg_yellow.s:bg_none.s:fmt_bold
+exe "hi pandocHeadingMarker" .s:fg_blue .s:bg_none.s:fmt_bold
exe "hi pandocEmphasisHeading" .s:fg_phead .s:bg_none.s:fmt_bldi
exe "hi pandocEmphasisNestedHeading" .s:fg_phead .s:bg_none.s:fmt_bldi
exe "hi pandocStrongEmphasisHeading" .s:fg_phead .s:bg_none.s:fmt_bold
@@ -818,9 +820,10 @@ exe "hi pandocSubscriptHeading" .s:fg_phead .s:bg_none.s:fmt_bold
exe "hi pandocLinkDelim" .s:fg_base01 .s:bg_none .s:fmt_none
exe "hi pandocLinkLabel" .s:fg_blue .s:bg_none .s:fmt_undr
exe "hi pandocLinkText" .s:fg_blue .s:bg_none .s:fmt_undb
-exe "hi pandocLinkURL" .s:fg_base00 .s:bg_none .s:fmt_none
-exe "hi pandocLinkTitle" .s:fg_base00 .s:bg_none .s:fmt_ital
-exe "hi pandocLinkDefinition" .s:fg_base1 .s:bg_none .s:fmt_none
+exe "hi pandocLinkURL" .s:fg_base00 .s:bg_none .s:fmt_undr
+exe "hi pandocLinkTitle" .s:fg_base00 .s:bg_none .s:fmt_undi
+exe "hi pandocLinkTitleDelim" .s:fg_base01 .s:bg_none .s:fmt_undi .s:sp_base00
+exe "hi pandocLinkDefinition" .s:fg_cyan .s:bg_none .s:fmt_undr .s:sp_base00
exe "hi pandocLinkDefinitionID" .s:fg_blue .s:bg_none .s:fmt_bold
exe "hi pandocImageCaption" .s:fg_violet .s:bg_none .s:fmt_undb
exe "hi pandocFootnoteLink" .s:fg_green .s:bg_none .s:fmt_undr