From ea708c19cd51a4ff5ce2e57b568fdee65bff745d Mon Sep 17 00:00:00 2001 From: dylnmc Date: Wed, 20 Sep 2017 18:24:10 -0400 Subject: fixes Todo (gui) bg color (high-contrast) fixes #52 --- colors/nord.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'colors') diff --git a/colors/nord.vim b/colors/nord.vim index 3b30d93..25e434c 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -174,7 +174,7 @@ call s:hi("StorageClass", s:nord9_gui, "", s:nord9_term, "", "", "") call s:hi("String", s:nord14_gui, "", s:nord14_term, "", "", "") call s:hi("Structure", s:nord9_gui, "", s:nord9_term, "", "", "") call s:hi("Tag", s:nord4_gui, "", "", "", "", "") -call s:hi("Todo", s:nord13_gui, "", s:nord13_term, "NONE", "", "") +call s:hi("Todo", s:nord13_gui, "NONE", s:nord13_term, "NONE", "", "") call s:hi("Type", s:nord9_gui, "", s:nord9_term, "", "NONE", "") call s:hi("Typedef", s:nord9_gui, "", s:nord9_term, "", "", "") hi! link Macro Define -- cgit v1.2.3-70-g09d2 From e18ab4e893f58a4a94d6df927884d8314e0f42d3 Mon Sep 17 00:00:00 2001 From: Sheldon Johnson Date: Sat, 23 Sep 2017 19:32:43 +1000 Subject: Implement comment brightness configuration feature GH-48 --- README.md | 22 ++++++++++++++++++++-- colors/nord.vim | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 4 deletions(-) (limited to 'colors') diff --git a/README.md b/README.md index 7c74a8e..4917782 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ Nord Vim is a 16 colorspace theme build to run in GUI- and terminal mode with su - [Activation](#activation) - [Configuration](#configuration) - [Italic comments](#italic-comments) + - [Comment contrast](#comment-contrast) - [Plugin Support](#plugin-support) - [UI Plugins](#ui-plugins) - [Language Plugins](#language-plugins) @@ -109,11 +110,28 @@ All options should be set **before** the [activation](#activation) command! Enable to use italic font for all comments. To adhere to the Nord style guide this option is disabled by default. -It can be enabled by setting the `g:nord_italic_comments` variable to `1`. +It can be enabled by setting the `g:nord_italic_comments` variable to `1`. + ```vim let g:nord_italic_comments = 1 ``` +### Comment contrast +**This option should only be enabled if your terminal emulator supports 24bit true color (16 million colors)!** + +This option is only visible if `termguicolors` is enabled in your `~/.vimrc` or set via `:set termguicolors`! + +The comment brightness can be increased by 1 - 20 percent. It can be enabled by setting the `g:nord_comment_brightness` +variable to a number between `1` and `20`. + +```vim +let g:nord_comment_brightness = 12 +``` + +To adhere to the Nord style guide this option uses `nord3` by default. + +More information about true color and the support in various terminals can be found in [this gist][gist-true-color]. + ## Plugin Support Nord Vim provides support for many third-party language- and the UI plugins. @@ -159,9 +177,9 @@ Please report issues/bugs, feature requests and suggestions for improvements to

+[gist-true-color]: https://gist.github.com/XVilka/8346728 [scrot-readme-default-profile]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/src/assets/scrot-readme-default-profile.png [scrot-readme-lazy-profile-change]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/src/assets/scrot-readme-lazy-profile-change.png - [scrot-lang-c]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-lang-c.png [scrot-lang-css]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-lang-css.png [scrot-lang-html]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-lang-html.png diff --git a/colors/nord.vim b/colors/nord.vim index 25e434c..c89f0b5 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -48,10 +48,38 @@ let s:nord13_term = "3" let s:nord14_term = "2" let s:nord15_term = "5" -if !exists('g:nord_italic_comments') +let s:nord3_gui_brightened = [ + \ s:nord3_gui, + \ "#4e586d", + \ "#505b70", + \ "#525d73", + \ "#556076", + \ "#576279", + \ "#59647c", + \ "#5b677f", + \ "#5d6982", + \ "#5f6c85", + \ "#616e88", + \ "#63718b", + \ "#66738e", + \ "#687591", + \ "#6a7894", + \ "#6d7a96", + \ "#6f7d98", + \ "#72809a", + \ "#75829c", + \ "#78859e", + \ "#7b88a1", +\ ] + +if !exists("g:nord_italic_comments") let g:nord_italic_comments = 0 endif +if !exists("g:nord_comment_brightness") + let g:nord_comment_brightness = 0 +endif + function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) let l:attr = a:attr if g:nord_italic_comments == 0 && l:attr ==? 'italic' @@ -150,7 +178,7 @@ call s:hi("VertSplit", s:nord2_gui, s:nord1_gui, s:nord3_term, s:nord1_term, "NO "+----------------------+ call s:hi("Boolean", s:nord9_gui, "", s:nord9_term, "", "", "") call s:hi("Character", s:nord14_gui, "", s:nord14_term, "", "", "") -call s:hi("Comment", s:nord3_gui, "", s:nord3_term, "", "italic", "") +call s:hi("Comment", s:nord3_gui_brightened[g:nord_comment_brightness], "", s:nord3_term, "", "italic", "") call s:hi("Conditional", s:nord9_gui, "", s:nord9_term, "", "", "") call s:hi("Constant", s:nord4_gui, "", "NONE", "", "", "") call s:hi("Define", s:nord9_gui, "", s:nord9_term, "", "", "") -- cgit v1.2.3-70-g09d2 From 1025d839319c760102f030c3183b6bf558b27d58 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 23 Sep 2017 15:22:27 +0200 Subject: Add plugin support for plasticboy/vim-markdown This adds support for the language plugin plasticboy/vim-markdown to match the style of the built-in markdown syntax styles. GH-45 --- colors/nord.vim | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'colors') diff --git a/colors/nord.vim b/colors/nord.vim index c89f0b5..9df083e 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -281,6 +281,12 @@ call s:hi("htmlLink", s:nord4_gui, "", "", "", "NONE", "NONE") hi! link htmlBold Bold hi! link htmlEndTag htmlTag hi! link htmlItalic Italic +hi! link htmlH1 markdownH1 +hi! link htmlH2 markdownH1 +hi! link htmlH3 markdownH1 +hi! link htmlH4 markdownH1 +hi! link htmlH5 markdownH1 +hi! link htmlH6 markdownH1 hi! link htmlSpecialChar SpecialChar hi! link htmlTag Keyword hi! link htmlTagN htmlTag @@ -314,7 +320,7 @@ call s:hi("markdownFootnote", s:nord7_gui, "", s:nord7_term, "", "", "") call s:hi("markdownId", s:nord7_gui, "", s:nord7_term, "", "", "") call s:hi("markdownIdDeclaration", s:nord7_gui, "", s:nord7_term, "", "", "") call s:hi("markdownH1", s:nord8_gui, "", s:nord8_term, "", "", "") -call s:hi("markdownLinkText", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:hi("markdownLinkText", s:nord8_gui, "", s:nord8_term, "", "", "") call s:hi("markdownUrl", s:nord4_gui, "", "NONE", "", "NONE", "") hi! link markdownFootnoteDefinition markdownFootnote hi! link markdownH2 markdownH1 @@ -440,3 +446,27 @@ hi! link jsFuncParens Delimiter hi! link jsNoise Delimiter hi! link jsPrototype Keyword hi! link jsRegexpString SpecialChar + +" Markdown +" > plasticboy/vim-markdown +call s:hi("mkdCode", s:nord7_gui, "", s:nord7_term, "", "", "") +call s:hi("mkdFootnote", s:nord8_gui, "", s:nord8_term, "", "", "") +call s:hi("mkdRule", s:nord10_gui, "", s:nord10_term, "", "", "") +call s:hi("mkdLineBreak", s:nord9_gui, "", s:nord9_term, "", "", "") +hi! link mkdBold Bold +hi! link mkdItalic Italic +hi! link mkdString Keyword +hi! link mkdCodeStart mkdCode +hi! link mkdCodeEnd mkdCode +hi! link mkdBlockquote Comment +hi! link mkdListItem Keyword +hi! link mkdListItemLine Normal +hi! link mkdFootnotes mkdFootnote +hi! link mkdLink markdownLinkText +hi! link mkdURL markdownUrl +hi! link mkdInlineURL mkdURL +hi! link mkdID Identifier "CHECK +hi! link mkdLinkDef mkdLink +hi! link mkdLinkDefTarget mkdURL +hi! link mkdLinkTitle mkdInlineURL +hi! link mkdDelimiter Keyword -- cgit v1.2.3-70-g09d2 From d3a96152eb066de7c9a6a3a9ec2d8169cf959792 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Thu, 28 Sep 2017 11:21:30 +0200 Subject: Add plugin support for vim-plug This adds support for "junegunn/vim-plug" for the "PlugClean" command which used the "Ignore" group for deleted directory listings resulting in unreadable text when "cursorline" has been set. GH-43 --- colors/nord.vim | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'colors') diff --git a/colors/nord.vim b/colors/nord.vim index 9df083e..1d2e46a 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -118,6 +118,7 @@ call s:hi("Underline", "", "", "", "", "underline", "") call s:hi("ColorColumn", "", s:nord1_gui, "NONE", s:nord1_term, "", "") call s:hi("Cursor", s:nord0_gui, s:nord4_gui, "", "NONE", "", "") call s:hi("CursorLine", "", s:nord1_gui, "NONE", s:nord1_term, "NONE", "") +call s:hi("Error", s:nord0_gui, s:nord11_gui, "", s:nord11_term, "", "") call s:hi("iCursor", s:nord0_gui, s:nord4_gui, "", "NONE", "", "") call s:hi("LineNr", s:nord3_gui, s:nord0_gui, s:nord3_term, "NONE", "", "") call s:hi("MatchParen", s:nord0_gui, s:nord8_gui, s:nord1_term, s:nord8_term, "", "") @@ -436,6 +437,10 @@ hi! link NERDTreeHelp Comment hi! link CtrlPMatch Keyword hi! link CtrlPBufferHid Normal +" vim-plug +" > junegunn/vim-plug +call s:hi("plugDeleted", s:nord11_gui, "", "", s:nord11_term, "", "") + "+--- Languages ---+ " JavaScript " > pangloss/vim-javascript -- cgit v1.2.3-70-g09d2 From 7bdc220cf6941f133c62c797612a0c96a9c6acd7 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Thu, 28 Sep 2017 15:24:53 +0200 Subject: Implement uniform diff background theme config Added a theme configuration to let the users decide whether they want to use colorful or uniform diff backgrounds. The colorful diff is the default using the current colors for added, changed and deleted elements and the default background color (nord0). The "reverse" attribute gets applied which results in a colored background and a dark foreground. Setting the "g:nord_uniform_diff_background" variable to "1" enables the uniform diff background using "nord1". GH-60 --- README.md | 15 ++++++++++++++- assets/scrot-config-uniform-diff-default.png | Bin 0 -> 84251 bytes assets/scrot-config-uniform-diff.png | Bin 0 -> 76274 bytes colors/nord.vim | 24 +++++++++++++++--------- 4 files changed, 29 insertions(+), 10 deletions(-) create mode 100755 assets/scrot-config-uniform-diff-default.png create mode 100755 assets/scrot-config-uniform-diff.png (limited to 'colors') diff --git a/README.md b/README.md index 4917782..707d713 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ Nord Vim is a 16 colorspace theme build to run in GUI- and terminal mode with su - [Configuration](#configuration) - [Italic comments](#italic-comments) - [Comment contrast](#comment-contrast) + - [Uniform diff background](#uniform-diff-background) - [Plugin Support](#plugin-support) - [UI Plugins](#ui-plugins) - [Language Plugins](#language-plugins) @@ -132,8 +133,20 @@ To adhere to the Nord style guide this option uses `nord3` by default. More information about true color and the support in various terminals can be found in [this gist][gist-true-color]. +### Uniform diff background +By default, Nord Vim provides colorful backgrounds when used in *diff* mode `vimdiff`/`vim -d`. + +This can be changed to `nord1` as uniform *diff* background color by setting the `g:nord_uniform_diff_background` variable to `1`. + +```vim +let g:nord_uniform_diff_background = 1 +``` + +Colorful backgrounds (default)

Uniform diff background
+

+ ## Plugin Support -Nord Vim provides support for many third-party language- and the UI plugins. +Nord Vim provides support for many third-party language- and UI plugins. ### UI Plugins

lightline

diff --git a/assets/scrot-config-uniform-diff-default.png b/assets/scrot-config-uniform-diff-default.png new file mode 100755 index 0000000..db96f9a Binary files /dev/null and b/assets/scrot-config-uniform-diff-default.png differ diff --git a/assets/scrot-config-uniform-diff.png b/assets/scrot-config-uniform-diff.png new file mode 100755 index 0000000..16b9aae Binary files /dev/null and b/assets/scrot-config-uniform-diff.png differ diff --git a/colors/nord.vim b/colors/nord.vim index 9df083e..9779dc4 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -80,6 +80,10 @@ if !exists("g:nord_comment_brightness") let g:nord_comment_brightness = 0 endif +if !exists("g:nord_uniform_diff_background") + let g:nord_uniform_diff_background = 0 +endif + function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) let l:attr = a:attr if g:nord_italic_comments == 0 && l:attr ==? 'italic' @@ -261,15 +265,17 @@ hi! link dtDelim Delimiter hi! link dtLocaleValue Keyword hi! link dtTypeValue Keyword -call s:hi("diffAdded", s:nord14_gui, "", s:nord14_term, "", "", "") -call s:hi("diffChanged", s:nord13_gui, "", s:nord13_term, "", "", "") -call s:hi("diffNewFile", s:nord8_gui, "", s:nord8_term, "", "", "") -call s:hi("diffOldFile", s:nord7_gui, "", s:nord7_term, "", "", "") -call s:hi("diffRemoved", s:nord11_gui, "", s:nord11_term, "", "", "") -call s:hi("DiffAdd", s:nord14_gui, "", s:nord14_term, "", "", "") -call s:hi("DiffChange", s:nord13_gui, "", s:nord13_term, "", "", "") -call s:hi("DiffDelete", s:nord11_gui, "", s:nord11_term, "", "", "") -call s:hi("DiffText", s:nord4_gui, "", "NONE", "", "", "") +if g:nord_uniform_diff_background == 0 + call s:hi("DiffAdd", s:nord14_gui, s:nord0_gui, s:nord14_term, "NONE", "inverse", "") + call s:hi("DiffChange", s:nord13_gui, s:nord0_gui, s:nord13_term, "NONE", "inverse", "") + call s:hi("DiffDelete", s:nord11_gui, s:nord0_gui, s:nord11_term, "NONE", "inverse", "") + call s:hi("DiffText", s:nord13_gui, s:nord0_gui, s:nord13_term, "NONE", "inverse", "") +else + call s:hi("DiffAdd", s:nord14_gui, s:nord1_gui, s:nord14_term, s:nord1_term, "", "") + call s:hi("DiffChange", s:nord13_gui, s:nord1_gui, s:nord13_term, s:nord1_term, "", "") + call s:hi("DiffDelete", s:nord11_gui, s:nord1_gui, s:nord11_term, s:nord1_term, "", "") + call s:hi("DiffText", s:nord13_gui, s:nord1_gui, s:nord13_term, s:nord1_term, "", "") +endif call s:hi("gitconfigVariable", s:nord7_gui, "", s:nord7_term, "", "", "") -- cgit v1.2.3-70-g09d2