New Release

AlessandroYorba · Apr 14, 2017 · b85e260 · b85e260
2 parents 3c65617 + f6beeb9
commit b85e260
Show file tree

Hide file tree

Showing 12 changed files with 238 additions and 179 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![Screenshot](https://cloud.githubusercontent.com/assets/11221489/24884378/f0017e86-1dfd-11e7-803b-f7502a8c2428.png)
+![Screenshot](https://cloud.githubusercontent.com/assets/11221489/25057059/bc9881f8-2121-11e7-9fe9-e57e696506ed.png)
 
 :space_invader: Set Up
 ------
@@ -31,9 +31,10 @@ colorscheme sierra
 let g:sierra_Pitch = 1
 colorscheme sierra 
 ```
-:milky_way: Sierra Nightly Build
-------------------------
-[Nightly Build](https://github.com/AlessandroYorba/Sierra/tree/nightly)
+
+:crescent_moon: Nightly Build
+----------------------------
+pre-release version [here](https://github.com/AlessandroYorba/Sierra/tree/nightly)
 
 :octocat: Special Thanks
 -----------------

diff --git a/colors/sierra.vim b/colors/sierra.vim
@@ -12,6 +12,55 @@
 " Script URL:   https://github.com/AlessandroYorba/Sierra
 " License:      MIT
 
+" Copyright (c) 2017 Alessandro Yorba
+"
+" Permission is hereby granted, free of charge, to any person obtaining a copy
+" of this software and associated documentation files (the "Software"), to deal
+" in the Software without restriction, including without limitation the rights
+" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+" copies of the Software, and to permit persons to whom the Software is
+" furnished to do so, subject to the following conditions:
+"
+" The above copyright notice and this permission notice shall be included in
+" all copies or substantial portions of the Software.
+"
+" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+" THE SOFTWARE.
+
+"=================================================================================
+" SIERRA TERMINAL:
+"=================================================================================
+"     Foreground    #e4e4e4             |      Selection     #875f5f             |
+"     Background    #303030             |      Selected Text #1e2834             |
+"     Bold          #ffffff             |                                        |
+"     Links         #005cbb             |                                        |
+"     CursorColor   #e4e4e4             |                                        |
+"     CursorText    #303030             |                                        |
+"=================================================================================
+" ANSI COLORS:                                                                   |
+"=================================================================================
+"---------------------------------------|-----------------------------------------
+"     NORMAL        Hex          xterm  |      BRIGHT        Hex          xterm  |
+"---------------------------------------|-----------------------------------------
+"     Black         #303030      0      |      brBlack       #686868      8      |
+"     Red           #af5f5f      1      |      brRed         #af5f5f      9      |
+"     Green         #d75f5f      2      |      brGreen       #d75f5f      10     |
+"     Yellow        #87d7d7      3      |      brYellow      #87d7d7      11     |
+"     Blue          #af8787      4      |      brBlue        #af8787      12     |
+"     Magenta       #dfaf87      5      |      brMagenta     #dfaf87      13     |
+"     Cyan          #ffafaf      6      |      brCyan        #ffafaf      14     |
+"     White         #e4e4e4      7      |      brWhite       #e4e4e4      15     |
+"---------------------------------------|-----------------------------------------
+"=================================================================================
+
+"=================================================================================
+" SETUP:
+"=================================================================================
 
 set background=dark
 
@@ -95,44 +144,44 @@ endif
 " SIERRA HIGHLIGHTING:
 "================================================================================
 
-highlight! Type                   guifg=#af8787  guibg=NONE     gui=NONE       ctermfg=138    ctermbg=NONE  cterm=NONE       
-highlight! Constant               guifg=#ff8787  guibg=NONE     gui=NONE       ctermfg=210    ctermbg=NONE  cterm=NONE       
-highlight! String                 guifg=#ffafaf  guibg=NONE     gui=NONE       ctermfg=217    ctermbg=NONE  cterm=NONE       
-highlight! Function               guifg=#afd7d7  guibg=NONE     gui=NONE       ctermfg=152    ctermbg=NONE  cterm=NONE       
-highlight! Statement              guifg=#87afaf  guibg=NONE     gui=NONE       ctermfg=109    ctermbg=NONE  cterm=NONE       
-highlight! PreProc                guifg=#d75f5f  guibg=NONE     gui=NONE       ctermfg=167    ctermbg=NONE  cterm=NONE       
-highlight! Special                guifg=#dfaf87  guibg=NONE     gui=NONE       ctermfg=180    ctermbg=NONE  cterm=NONE       
-highlight! Title                  guifg=#d78787  guibg=NONE     gui=NONE       ctermfg=174    ctermbg=NONE  cterm=NONE       
-highlight! Question               guifg=#dfaf5f  guibg=NONE     gui=NONE       ctermfg=179    ctermbg=NONE  cterm=NONE       
-highlight! Underlined             guifg=#87afd7  guibg=NONE     gui=NONE       ctermfg=110    ctermbg=NONE  cterm=NONE       
-highlight! WarningMsg             guifg=#d75f5f  guibg=NONE     gui=NONE       ctermfg=167    ctermbg=NONE  cterm=NONE       
-highlight! Error                  guifg=#d75f5f  guibg=NONE     gui=reverse    ctermfg=167    ctermbg=NONE  cterm=reverse  
-highlight! SignColumn             guifg=#87af87  guibg=NONE     gui=NONE       ctermfg=108    ctermbg=NONE  cterm=NONE       
-highlight! Visual                 guifg=#eeeeee  guibg=#875f5f  gui=NONE       ctermfg=255    ctermbg=95    cterm=NONE       
-highlight! Search                 guifg=#eeeeee  guibg=#5f8787  gui=NONE       ctermfg=255    ctermbg=66    cterm=NONE       
-highlight! PmenuSbar              guifg=NONE     guibg=NONE     gui=NONE       ctermfg=NONE   ctermbg=NONE  cterm=NONE       
-highlight! DiffAdd                guifg=#afafd7  guibg=NONE     gui=reverse    ctermfg=146    ctermbg=NONE  cterm=reverse    
-highlight! Todo                   guifg=#eeeeee  guibg=#1c1c1c  gui=reverse    ctermfg=255    ctermbg=234   cterm=reverse    
-highlight! DiffChange             guifg=#5f5f87  guibg=NONE     gui=reverse    ctermfg=60     ctermbg=NONE  cterm=reverse    
-highlight! DiffText               guifg=#8787af  guibg=NONE     gui=reverse    ctermfg=103    ctermbg=NONE  cterm=reverse    
-highlight! DiffDelete             guifg=#af5f5f  guibg=NONE     gui=reverse    ctermfg=131    ctermbg=NONE  cterm=reverse    
-highlight! SpellBad               guifg=#ff0000  guibg=NONE     gui=undercurl  ctermfg=196    ctermbg=NONE  cterm=undercurl  
-highlight! SpellLocal             guifg=#5f875f  guibg=NONE     gui=undercurl  ctermfg=65     ctermbg=NONE  cterm=undercurl  
-highlight! SpellCap               guifg=#87afff  guibg=NONE     gui=undercurl  ctermfg=111    ctermbg=NONE  cterm=undercurl  
-highlight! SpellRare              guifg=#ff8700  guibg=NONE     gui=undercurl  ctermfg=208    ctermbg=NONE  cterm=undercurl  
+highlight! Operator               guifg=#af8787  guibg=NONE     gui=NONE       ctermfg=138    ctermbg=NONE  cterm=NONE
+highlight! Constant               guifg=#d78787  guibg=NONE     gui=NONE       ctermfg=174    ctermbg=NONE  cterm=NONE
+highlight! String                 guifg=#ffafaf  guibg=NONE     gui=NONE       ctermfg=217    ctermbg=NONE  cterm=NONE
+highlight! Function               guifg=#87d7d7  guibg=NONE     gui=NONE       ctermfg=116    ctermbg=NONE  cterm=NONE
+highlight! Statement              guifg=#87afaf  guibg=NONE     gui=NONE       ctermfg=109    ctermbg=NONE  cterm=NONE
+highlight! PreProc                guifg=#d75f5f  guibg=NONE     gui=NONE       ctermfg=167    ctermbg=NONE  cterm=NONE
+highlight! Special                guifg=#dfaf87  guibg=NONE     gui=NONE       ctermfg=180    ctermbg=NONE  cterm=NONE
+highlight! Question               guifg=#dfaf5f  guibg=NONE     gui=NONE       ctermfg=179    ctermbg=NONE  cterm=NONE
+highlight! Underlined             guifg=#87afd7  guibg=NONE     gui=NONE       ctermfg=110    ctermbg=NONE  cterm=NONE
+highlight! WarningMsg             guifg=#d75f5f  guibg=NONE     gui=NONE       ctermfg=167    ctermbg=NONE  cterm=NONE
+highlight! Error                  guifg=#d75f5f  guibg=NONE     gui=reverse    ctermfg=167    ctermbg=NONE  cterm=reverse
+highlight! SignColumn             guifg=#87af87  guibg=NONE     gui=NONE       ctermfg=108    ctermbg=NONE  cterm=NONE
+highlight! Visual                 guifg=#eeeeee  guibg=#875f5f  gui=NONE       ctermfg=255    ctermbg=95    cterm=NONE
+highlight! Search                 guifg=#eeeeee  guibg=#5f8787  gui=NONE       ctermfg=255    ctermbg=66    cterm=NONE
+highlight! PmenuSbar              guifg=NONE     guibg=NONE     gui=NONE       ctermfg=NONE   ctermbg=NONE  cterm=NONE
+highlight! DiffAdd                guifg=#afafd7  guibg=NONE     gui=reverse    ctermfg=146    ctermbg=NONE  cterm=reverse
+highlight! Todo                   guifg=#eeeeee  guibg=#1c1c1c  gui=reverse    ctermfg=255    ctermbg=234   cterm=reverse
+highlight! DiffChange             guifg=#5f5f87  guibg=NONE     gui=reverse    ctermfg=60     ctermbg=NONE  cterm=reverse
+highlight! DiffText               guifg=#8787af  guibg=NONE     gui=reverse    ctermfg=103    ctermbg=NONE  cterm=reverse
+highlight! DiffDelete             guifg=#af5f5f  guibg=NONE     gui=reverse    ctermfg=131    ctermbg=NONE  cterm=reverse
+highlight! SpellBad               guifg=#ff0000  guibg=NONE     gui=undercurl  ctermfg=196    ctermbg=NONE  cterm=undercurl
+highlight! SpellLocal             guifg=#5f875f  guibg=NONE     gui=undercurl  ctermfg=65     ctermbg=NONE  cterm=undercurl
+highlight! SpellCap               guifg=#87afff  guibg=NONE     gui=undercurl  ctermfg=111    ctermbg=NONE  cterm=undercurl
+highlight! SpellRare              guifg=#ff8700  guibg=NONE     gui=undercurl  ctermfg=208    ctermbg=NONE  cterm=undercurl
 highlight! CursorLineNr           guifg=#5f8787  guibg=NONE     gui=reverse    ctermfg=66     ctermbg=NONE cterm=reverse
 
-highlight! link Operator          Statement
-highlight! link Directory         Type
+highlight! link Directory         PreProc
+highlight! link Title             PreProc
+highlight! link htmlItalic        PreProc
+highlight! link ErrorMsg          PreProc
+highlight! link Type              PreProc
 highlight! link MatchParen        Visual
 highlight! link WildMenu          Visual
 highlight! link ModeMsg           Statement
 highlight! link htmlArg           Constant
 highlight! link FoldColumn        Identifier
 highlight! link Identifier        Function
 highlight! link htmlStatement     Function
-highlight! link htmlItalic        PreProc
-highlight! link ErrorMsg          PreProc
 highlight! link MoreMsg           Question
 highlight! link SpecialKey        Underlined
 highlight! link PmenuThumb        PmenuSbar
@@ -159,6 +208,7 @@ if 1
     highlight! link PmenuSel        StatusLine
     highlight! link CursorColumn    CursorLine
     highlight! link ColorColumn     CursorLine
+    highlight! link VimCommentTitle SpecialComment
 endif
 
 "================================================================================
@@ -183,6 +233,7 @@ if g:sierra_Sunset
     highlight! link PmenuSel        StatusLine
     highlight! link CursorColumn    CursorLine
     highlight! link ColorColumn     CursorLine
+    highlight! link VimCommentTitle SpecialComment
 endif
 
 "================================================================================
@@ -207,6 +258,7 @@ if g:sierra_Twilight
     highlight! link PmenuSel        StatusLine
     highlight! link CursorColumn    CursorLine
     highlight! link ColorColumn     CursorLine
+    highlight! link VimCommentTitle SpecialComment
 endif
 
 "================================================================================
@@ -231,6 +283,7 @@ if g:sierra_Midnight
     highlight! link PmenuSel        StatusLine
     highlight! link CursorColumn    CursorLine
     highlight! link ColorColumn     CursorLine
+    highlight! link VimCommentTitle SpecialComment
 endif
 
 "================================================================================
@@ -255,19 +308,19 @@ if g:sierra_Pitch
     highlight! link PmenuSel        StatusLine
     highlight! link CursorColumn    CursorLine
     highlight! link ColorColumn     CursorLine
+    highlight! link VimCommentTitle SpecialComment
 endif
 
 "================================================================================
 " NEVADA:
 "================================================================================
 if g:sierra_Nevada
-    highlight! MatchParen         guifg=#ffffff  guibg=#000000  gui=underline  ctermfg=231  ctermbg=16  cterm=underline 
+    highlight! MatchParen         guifg=#ffffff  guibg=#000000  gui=underline  ctermfg=231  ctermbg=16  cterm=underline
 endif
 
 "================================================================================
 " CLEAR SKIES:
 "================================================================================
 if g:sierra_Clear_Skies
-    highlight! CursorLine         guifg=NONE  guibg=NONE  gui=NONE  ctermfg=NONE  ctermbg=NONE  cterm=NONE 
+    highlight! CursorLine         guifg=NONE  guibg=NONE  gui=NONE  ctermfg=NONE  ctermbg=NONE  cterm=NONE
 endif
-
diff --git a/terminal_colors/sierra.Xresources b/terminal_colors/sierra.Xresources
@@ -16,8 +16,8 @@
 *.color10:      #d75f5f
 
 ! yellow
-*.color3:       #afd7d7
-*.color11:      #afd7d7
+*.color3:       #87d7d7
+*.color11:      #87d7d7
 
 ! blue
 *.color4:       #af8787
@@ -32,5 +32,5 @@
 *.color14:      #ffb2af
 
 ! white
-*.color7:       #f7e4c0
-*.color15:      #ffffff
+*.color7:       #e4e4e4
+*.color15:      #e4e4e4
diff --git a/terminal_colors/sierra.itermcolors b/terminal_colors/sierra.itermcolors
@@ -46,13 +46,13 @@
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.80655348300933838</real>
+		<real>0.80634629726409912</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.81012499332427979</real>
+		<real>0.81257504224777222</real>
 		<key>Red Component</key>
-		<real>0.62974303960800171</real>
+		<real>0.46630579233169556</real>
 	</dict>
 	<key>Ansi 12 Color</key>
 	<dict>
@@ -98,13 +98,13 @@
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.99999129772186279</real>
+		<real>0.86846637725830078</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.99997437000274658</real>
+		<real>0.86845165491104126</real>
 		<key>Red Component</key>
-		<real>1</real>
+		<real>0.86847764253616333</real>
 	</dict>
 	<key>Ansi 2 Color</key>
 	<dict>
@@ -124,13 +124,13 @@
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.80655348300933838</real>
+		<real>0.80634629726409912</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.81012499332427979</real>
+		<real>0.81257504224777222</real>
 		<key>Red Component</key>
-		<real>0.62974303960800171</real>
+		<real>0.46630579233169556</real>
 	</dict>
 	<key>Ansi 4 Color</key>
 	<dict>
@@ -176,13 +176,13 @@
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.70143401622772217</real>
+		<real>0.86846637725830078</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.87181943655014038</real>
+		<real>0.86845165491104126</real>
 		<key>Red Component</key>
-		<real>0.95863091945648193</real>
+		<real>0.86847764253616333</real>
 	</dict>
 	<key>Ansi 8 Color</key>
 	<dict>
@@ -319,26 +319,27 @@
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.0</real>
+		<real>0.86846637725830078</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.0</real>
+		<real>0.86845165491104126</real>
 		<key>Red Component</key>
-		<real>0.0</real>
+		<real>0.86847764253616333</real>
 	</dict>
 	<key>Selection Color</key>
 	<dict>
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>0.99919813871383667</real>
+		<real>0.30021178722381592</real>
 		<key>Color Space</key>
 		<string>Calibrated</string>
 		<key>Green Component</key>
-		<real>0.7925102710723877</real>
+		<real>0.29614907503128052</real>
 		<key>Red Component</key>
-		<real>0.65466058254241943</real>
+		<real>0.45157793164253235</real>
 	</dict>
 </dict>
 </plist>
+
diff --git a/terminal_colors/sierra_Midnight.Xresources b/terminal_colors/sierra_Midnight.Xresources
@@ -16,8 +16,8 @@
 *.color10:      #d75f5f
 
 ! yellow
-*.color3:       #afd7d7
-*.color11:      #afd7d7
+*.color3:       #87d7d7
+*.color11:      #87d7d7
 
 ! blue
 *.color4:       #af8787
@@ -32,5 +32,5 @@
 *.color14:      #ffb2af
 
 ! white
-*.color7:       #f7e4c0
-*.color15:      #ffffff
+*.color7:       #dfdfdf
+*.color15:      #dfdfdf