Skip to content

Commit

Permalink
Rename to challenger_deep
Browse files Browse the repository at this point in the history
  • Loading branch information
MaxSt committed Dec 29, 2017
1 parent 945d7c3 commit a8035a8
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 42 deletions.
19 changes: 13 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
## FlatColor ##
![Challenger Deep](https://s17.postimg.org/8b54c0ia7/challenger-deep.png)

### Challenger Deep Theme for VIM

To enable this color scheme, set it in your vimrc:
```
colorscheme challenger_deep
```

### Terminal True Color Support ###
Add this to your .vimrc to enable true colors:
Expand All @@ -13,13 +20,13 @@ endif
![Screenshot](https://s12.postimg.org/cyiwvuxwd/flatcolor.png)

### Options ###
* **g:flatcolor_termcolors**:
* **g:challenger_deep_termcolors**
This options sets the terminal colors to 16 or 256 Colors. Default value is 256.
If it is set to 16 ,this colorscheme will attempt to use the standard 16 colors of your terminal emulator and background color will be the default background color of your terminal emulator.
For the best colors in terminal, its recommended to set set your terminalcolors to [FlatColor Terminal Colors](#flatcolor-terminal-colors) and use 16 colors.
For the best colors in terminal, its recommended to set set your terminalcolors to [Challenger Deep Terminal Colors](#challenger-deep-terminal-colors) and use 16 colors.


### FlatColor Terminal Colors ###
### Challenger Deep Terminal Colors ###
```
! ~/.Xresource
*.foreground: #cbe3e7
Expand Down Expand Up @@ -63,9 +70,9 @@ endif

![Lightline](http://s1.postimg.org/k6t3zssn3/lightline.png)

FlatColor supports [lightline.vim](https://github.com/itchyny/lightline.vim). To enable the colorscheme,
Challenger Deep supports [lightline.vim](https://github.com/itchyny/lightline.vim). To enable the colorscheme,
add one of the following lines to your `.vimrc`:

``` viml
let g:lightline = { 'colorscheme': 'flatcolor' }
let g:lightline = { 'colorscheme': 'challenger_deep'}
```
Original file line number Diff line number Diff line change
Expand Up @@ -43,74 +43,74 @@ let s:bg_dark = s:dark_asphalt
let s:norm = s:clouds
let s:norm_subtle = s:dark_clouds
let s:visual = s:bg_dark
let g:airline#themes#flatcolor#palette = {}
let g:airline#themes#challenger_deep#palette = {}

let s:N1 = [ s:bg_subtle.gui, s:cyan.gui, s:bg_subtle.cterm16, s:cyan.cterm16 ]
let s:N2 = [ s:bg_subtle.gui, s:dark_cyan.gui, s:bg_subtle.cterm16, s:dark_cyan.cterm16 ]
let s:N3 = [ s:white.gui, s:bg_subtle.gui, s:white.cterm16, s:bg_subtle.cterm16 ]
let g:airline#themes#flatcolor#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
let g:airline#themes#challenger_deep#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)

let g:airline#themes#flatcolor#palette.normal_modified = {
let g:airline#themes#challenger_deep#palette.normal_modified = {
\ 'airline_c': [ s:N3[0] , s:N3[1] , s:N3[2] , s:N3[3], '' ] ,
\ }

let s:I1 = [ s:bg_subtle.gui , s:red.gui , s:bg_subtle.cterm16 , s:red.cterm16]
let s:I2 = [ s:bg_subtle.gui , s:dark_red.gui , s:bg_subtle.cterm16 , s:dark_red.cterm16]
let s:I3 = [ s:white.gui, s:bg_subtle.gui, s:white.cterm16, s:bg_subtle.cterm16 ]
let g:airline#themes#flatcolor#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
let g:airline#themes#flatcolor#palette.insert_modified = {
let g:airline#themes#challenger_deep#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
let g:airline#themes#challenger_deep#palette.insert_modified = {
\ 'airline_c': [ s:white.gui , s:bg_subtle.gui , s:white.cterm16, s:bg_subtle.cterm16 , '' ] ,
\ }
let g:airline#themes#flatcolor#palette.insert_paste = {
let g:airline#themes#challenger_deep#palette.insert_paste = {
\ 'airline_a': [ s:I1[0] , s:yellow.gui , s:I1[2] , s:yellow.cterm16 , '' ] ,
\ }


let g:airline#themes#flatcolor#palette.replace = copy(g:airline#themes#flatcolor#palette.insert)
let g:airline#themes#flatcolor#palette.replace.airline_a = [ s:I2[0] , s:yellow.gui , s:I2[2] , s:yellow.cterm16 , '' ]
let g:airline#themes#flatcolor#palette.replace_modified = g:airline#themes#flatcolor#palette.insert_modified
let g:airline#themes#challenger_deep#palette.replace = copy(g:airline#themes#challenger_deep#palette.insert)
let g:airline#themes#challenger_deep#palette.replace.airline_a = [ s:I2[0] , s:yellow.gui , s:I2[2] , s:yellow.cterm16 , '' ]
let g:airline#themes#challenger_deep#palette.replace_modified = g:airline#themes#challenger_deep#palette.insert_modified


let s:V1 = [ s:bg_subtle.gui , s:yellow.gui , s:bg_subtle.cterm16 , s:yellow.cterm16]
let s:V2 = [ s:bg_subtle.gui , s:dark_yellow.gui , s:bg_subtle.cterm16 , s:dark_yellow.cterm16]
let s:V3 = [ s:white.gui, s:bg_subtle.gui, s:white.cterm16, s:bg_subtle.cterm16 ]
let g:airline#themes#flatcolor#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
let g:airline#themes#flatcolor#palette.visual_modified = {
let g:airline#themes#challenger_deep#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
let g:airline#themes#challenger_deep#palette.visual_modified = {
\ 'airline_c': [ s:V3[0] , s:V3[1] , s:V3[2] , s:V3[3], '' ] ,
\ }

let s:IA1 = [ s:bg_subtle.gui , s:purple.gui , s:bg_subtle.cterm16 , s:purple.cterm16]
let s:IA2 = [ s:bg_subtle.gui , s:dark_purple.gui , s:bg_subtle.cterm16 , s:dark_purple.cterm16]
let s:IA3 = [ s:white.gui, s:bg_subtle.gui, s:white.cterm16, s:bg_subtle.cterm16 ]
let g:airline#themes#flatcolor#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
let g:airline#themes#flatcolor#palette.inactive_modified = {
let g:airline#themes#challenger_deep#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
let g:airline#themes#challenger_deep#palette.inactive_modified = {
\ 'airline_c': [ s:IA3[0] , s:IA3[1] , s:IA3[2] , s:IA3[3], '' ] ,
\ }


let s:WI = [ s:yellow.gui, s:dark_red.gui, s:yellow.cterm16, s:dark_red.cterm16 ]
let g:airline#themes#flatcolor#palette.normal.airline_warning = [
let g:airline#themes#challenger_deep#palette.normal.airline_warning = [
\ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
\ ]

let g:airline#themes#flatcolor#palette.normal_modified.airline_warning =
\ g:airline#themes#flatcolor#palette.normal.airline_warning
let g:airline#themes#challenger_deep#palette.normal_modified.airline_warning =
\ g:airline#themes#challenger_deep#palette.normal.airline_warning

let g:airline#themes#flatcolor#palette.insert.airline_warning =
\ g:airline#themes#flatcolor#palette.normal.airline_warning
let g:airline#themes#challenger_deep#palette.insert.airline_warning =
\ g:airline#themes#challenger_deep#palette.normal.airline_warning

let g:airline#themes#flatcolor#palette.insert_modified.airline_warning =
\ g:airline#themes#flatcolor#palette.normal.airline_warning
let g:airline#themes#challenger_deep#palette.insert_modified.airline_warning =
\ g:airline#themes#challenger_deep#palette.normal.airline_warning

let g:airline#themes#flatcolor#palette.visual.airline_warning =
\ g:airline#themes#flatcolor#palette.normal.airline_warning
let g:airline#themes#challenger_deep#palette.visual.airline_warning =
\ g:airline#themes#challenger_deep#palette.normal.airline_warning

let g:airline#themes#flatcolor#palette.visual_modified.airline_warning =
\ g:airline#themes#flatcolor#palette.normal.airline_warning
let g:airline#themes#challenger_deep#palette.visual_modified.airline_warning =
\ g:airline#themes#challenger_deep#palette.normal.airline_warning

let g:airline#themes#flatcolor#palette.replace.airline_warning =
\ g:airline#themes#flatcolor#palette.normal.airline_warning
let g:airline#themes#challenger_deep#palette.replace.airline_warning =
\ g:airline#themes#challenger_deep#palette.normal.airline_warning

let g:airline#themes#flatcolor#palette.replace_modified.airline_warning =
\ g:airline#themes#flatcolor#palette.normal.airline_warning
let g:airline#themes#challenger_deep#palette.replace_modified.airline_warning =
\ g:airline#themes#challenger_deep#palette.normal.airline_warning

16 changes: 8 additions & 8 deletions colors/flatcolor.vim → colors/challenger_deep.vim
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
" Vim Color File
" Name: flatcolor.vim
" Name: challenger_deep.vim
" Version: 2.0
" Maintainer: github.com/MaxSt
" License: The MIT License (MIT)
Expand All @@ -11,17 +11,17 @@ if exists('syntax on')
syntax reset
endif

let g:colors_name='flatcolor'
let g:colors_name='challenger_deep'
set background=dark


if ! exists("g:flatcolor_termcolors")
let g:flatcolor_termcolors = 256
if ! exists("g:challenger_deep_termcolors")
let g:challenger_deep_termcolors = 256
endif

" not all terminals support italics properly. If yours does, opt-in.
if ! exists("g:flatcolor_terminal_italics")
let g:flatcolor_terminal_italics = 0
if ! exists("g:challenger_deep_terminal_italics")
let g:challenger_deep_terminal_italics = 0
endif

" Colors
Expand Down Expand Up @@ -77,10 +77,10 @@ let s:head_c = s:dark_cyan
" shamelessly stolen from hemisu: https://github.com/noahfrederick/vim-hemisu/
function! s:h(group, style)
" Not all terminals support italics properly. If yours does, opt-in.
if g:flatcolor_terminal_italics == 0 && has_key(a:style, "cterm") && a:style["cterm"] == "italic"
if g:challenger_deep_terminal_italics == 0 && has_key(a:style, "cterm") && a:style["cterm"] == "italic"
unlet a:style.cterm
endif
if g:flatcolor_termcolors == 16
if g:challenger_deep_termcolors == 16
let l:ctermfg = (has_key(a:style, "fg") ? a:style.fg.cterm16 : "NONE")
let l:ctermbg = (has_key(a:style, "bg") ? a:style.bg.cterm16 : "NONE")
else
Expand Down

0 comments on commit a8035a8

Please sign in to comment.