aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Arctic Ice Studio <development@arcticicestudio.com>2017-02-23 19:42:23 +0100
committerGravatar Arctic Ice Studio <development@arcticicestudio.com>2017-02-23 19:42:23 +0100
commitcc1ca97be11857136ee89a5f19889fd88c61b434 (patch)
tree1cfba3b49a64fb64e67b4661ed7a1f11dd56ecbb
parentec4a9cb42793abfa4b021f7ba73f30da59411b8d (diff)
parent6c3e6f07a94c644a76c624d820ef5733814ed2c8 (diff)
downloadnord-vim-cc1ca97be11857136ee89a5f19889fd88c61b434.tar.gz
Merge branch 'release/0.4.0'
-rw-r--r--CHANGELOG.md28
-rw-r--r--README.md52
-rwxr-xr-xautoload/airline/themes/nord.vim4
-rwxr-xr-xautoload/lightline/colorscheme/nord.vim4
-rwxr-xr-xcolors/nord.vim53
5 files changed, 120 insertions, 21 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3eccccb..d9fac03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,33 @@
---
+# 0.4.0
+*2017-02-23*
+## Features
+### [Configurations][readme-configuration]
+❯ Added a configuration to enable [italic comments](https://github.com/arcticicestudio/nord-vim#italic-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`.
+```vim
+let g:nord_italic_comments = 1
+```
+(@kepbod, #13 (PR #16), dc6149f4)
+
+## Improvements
+### Plugin Support
+❯ The method/function signature live preview of the [`jedi-vim`](https://github.com/davidhalter/jedi-vim) plugin is now colorized correctly. (@mkalinski, #14, a5c3459a)
+
+<p align="center"><strong>Before</strong><br><img src="https://cloud.githubusercontent.com/assets/7836623/22618347/4857d88e-eada-11e6-9696-83a8886f5771.png"/><br><strong>After</strong><br><img src="https://cloud.githubusercontent.com/assets/7836623/22618354/63ddffde-eada-11e6-8a60-52a39642728e.png"/></p>
+
+### Language Support
+❯ Implemented optimized styles for the Python syntax group `pythonEscape`. (@mkalinski, #22, 360a76ea)
+![ghi-22-scrot-pythonescape](https://cloud.githubusercontent.com/assets/7836623/22618370/ad74e7fc-eada-11e6-89f2-23b351e8aa2b.png)
+
+❯ Implemented optimized styles for the SQL syntax groups `sqlSpecial` which is now linked to the `sqlKeyword` group to colorize constants like `true`/`false` and `null` as keywords. (@mkalinski, #23, dcfb441e)
+
+### Documentation
+❯ Added the new terminal emulator port project [Nord Hyper](https://github.com/arcticicestudio/nord-hyper)
+[![Nord Hyper](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-hyper-banner.svg)](https://github.com/arcticicestudio/nord-hyper)
+
# 0.3.0
*2017-01-24*
## Improvements
@@ -67,3 +94,4 @@ Detailed information about features, supported plugins/languages and install ins
**Project Initialization**
[nord-lightline]: https://github.com/arcticicestudio/nord-vim/blob/develop/autoload/lightline/colorscheme/nord.vim
+[readme-configuration]: https://github.com/arcticicestudio/nord-vim#configuration
diff --git a/README.md b/README.md
index 8e60263..3e9d5f5 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,21 @@ Nord Vim is a 16 colorspace theme build to run in GUI- and terminal mode with su
<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/assets/scrot-lang-javascript.png"/><br><blockquote>Font: <a href="https://adobe-fonts.github.io/source-code-pro">Source Code Pro</a> 20px</blockquote></p>
+ - [Getting started](#getting-started)
+ - [Installation](#installation)
+ - [Via plugin/runtimepath manager](#via-pluginruntimepath-manager)
+ - [Manual](#manual)
+ - [Activation](#activation)
+ - [Configuration](#configuration)
+ - [Italic comments](#italic-comments)
+ - [Plugin Support](#plugin-support)
+ - [UI Plugins](#ui-plugins)
+ - [Language Plugins](#language-plugins)
+ - [JavaScript](#javascript)
+ - [Languages](#languages)
+ - [Development](#development)
+ - [Contribution](#contribution)
+
## Getting started
### Installation
**NOTE**: Nord Vim in terminal mode **MUST** be used with the associated terminal emulator theme in order to work properly!
@@ -20,6 +35,7 @@ Make sure to install one of the currently supported terminal themes listed below
[![Nord GNOME Terminal](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-gnome-terminal-banner.svg)](https://github.com/arcticicestudio/nord-gnome-terminal)
[![Nord Guake](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-guake-banner.svg)](https://github.com/arcticicestudio/nord-guake)
+[![Nord Hyper](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-hyper-banner.svg)](https://github.com/arcticicestudio/nord-hyper)
[![Nord iTerm2](https://cdn.rawgit.com/arcticicestudio/nord/0971858f496823fd916f3368961f16ef2c7aad1e/src/assets/nord-iterm2-banner.svg)](https://github.com/arcticicestudio/nord-iterm2)
[![Nord Konsole](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-konsole-banner.svg)](https://github.com/arcticicestudio/nord-konsole)
[![Nord Mintty](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-mintty-banner.svg)](https://github.com/arcticicestudio/nord-mintty)
@@ -34,19 +50,19 @@ Make sure to install one of the currently supported terminal themes listed below
#### Via plugin/runtimepath manager
I recommend to use [`vim-plug`](https://github.com/junegunn/vim-plug).
Add Nord Vim to your `.vimrc`
-```sh
+```vim
Plug 'arcticicestudio/nord-vim'
```
and install via `:PlugInstall`.
You can specify the `develop` branch to install the latest development version.
-```sh
+```vim
Plug 'arcticicestudio/nord-vim', { 'branch': 'develop' }
```
A specific version can be installed via git tags.
-```sh
-Plug 'arcticicestudio/nord-vim', { 'tag': 'v0.3.0' }
+```vim
+Plug 'arcticicestudio/nord-vim', { 'tag': 'v0.4.0' }
```
Of course it can be installed with any of your favorite tools:
@@ -58,7 +74,7 @@ git clone git://github.com/arcticicestudio/nord-vim.git
[`Vundle`](https://github.com/VundleVim/Vundle.vim)
Add Nord Vim to your `.vimrc`
-```sh
+```vim
Plugin 'arcticicestudio/nord-vim'
```
and install via `:PluginInstall`.
@@ -68,22 +84,36 @@ and install via `:PluginInstall`.
### Activation
Use Nord Vim as your default color theme by adding it to your `.vimrc`
-```sh
+```vim
colorscheme nord
```
or change it on-the-fly by running `:colorscheme nord`.
[`vim-plug`](https://github.com/junegunn/vim-plug) also provides options to enable it on-demand for specific languages
-```sh
+```vim
" Activate Nord Vim when editing Java files
Plug 'arcticicestudio/nord-vim', { 'for': 'java' }
```
or on specific events.
-```sh
+```vim
" Activate Nord Vim when toggling the NERDTree
Plug 'arcticicestudio/nord-vim', { 'on': 'NERDTreeToggle' }
```
+## Configuration
+All options should be set **before** the [activation](#activation) command!
+
+### Italic comments
+**This option should only be enabled if your terminal emulator supports italics!**
+
+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`.
+```vim
+let g:nord_italic_comments = 1
+```
+
## Plugin Support
Nord Vim provides support for many third-party language- and the UI plugins.
@@ -118,16 +148,16 @@ Detailed descriptions for supported languages can be found in the [project wiki]
![][scrot-lang-ruby]
## Development
-[![](https://img.shields.io/badge/Changelog-0.3.0-blue.svg)](https://github.com/arcticicestudio/nord-vim/blob/v0.3.0/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-blue.svg)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-blue.svg)](https://github.com/arcticicestudio/arcver)
+[![](https://img.shields.io/badge/Changelog-0.4.0-81A1C1.svg)](https://github.com/arcticicestudio/nord-vim/blob/v0.4.0/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-81A1C1.svg)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-81A1C1.svg)](https://github.com/arcticicestudio/arcver)
### Contribution
Please report issues/bugs, feature requests and suggestions for improvements to the [issue tracker](https://github.com/arcticicestudio/nord-vim/issues).
<p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/banner-footer-mountains.svg" /></p>
-<p align="center"> <img src="http://arcticicestudio.com/favicon.ico" width=16 height=16/> Copyright &copy; 2016 Arctic Ice Studio</p>
+<p align="center"> <img src="http://arcticicestudio.com/favicon.ico" width=16 height=16/> Copyright &copy; 2017 Arctic Ice Studio</p>
-<p align="center"><a href="http://www.apache.org/licenses/LICENSE-2.0"><img src="https://img.shields.io/badge/License-Apache_2.0-blue.svg"/></a> <a href="https://creativecommons.org/licenses/by-sa/4.0"><img src="https://img.shields.io/badge/License-CC_BY--SA_4.0-blue.svg"/></a></p>
+<p align="center"><a href="http://www.apache.org/licenses/LICENSE-2.0"><img src="https://img.shields.io/badge/License-Apache_2.0-5E81AC.svg"/></a> <a href="https://creativecommons.org/licenses/by-sa/4.0"><img src="https://img.shields.io/badge/License-CC_BY--SA_4.0-5E81AC.svg"/></a></p>
[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
diff --git a/autoload/airline/themes/nord.vim b/autoload/airline/themes/nord.vim
index d8493bf..e3d6d92 100755
--- a/autoload/airline/themes/nord.vim
+++ b/autoload/airline/themes/nord.vim
@@ -4,9 +4,9 @@
" repository https://github.com/arcticicestudio/nord-vim +
" author Arctic Ice Studio +
" email development@arcticicestudio.com +
-" copyright Copyright (C) 2016 +
+" copyright Copyright (C) 2017 +
" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-let s:nord_vim_version="0.3.0"
+let s:nord_vim_version="0.4.0"
let g:airline#themes#nord#palette = {}
let s:nord0_gui = "#2E3440"
diff --git a/autoload/lightline/colorscheme/nord.vim b/autoload/lightline/colorscheme/nord.vim
index b08a1e6..cf4dd75 100755
--- a/autoload/lightline/colorscheme/nord.vim
+++ b/autoload/lightline/colorscheme/nord.vim
@@ -4,9 +4,9 @@
" repository https://github.com/arcticicestudio/nord-vim +
" author Arctic Ice Studio +
" email development@arcticicestudio.com +
-" copyright Copyright (C) 2016 +
+" copyright Copyright (C) 2017 +
" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-let s:nord_vim_version="0.3.0"
+let s:nord_vim_version="0.4.0"
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
let s:nord0 = ["#2E3440", "NONE"]
diff --git a/colors/nord.vim b/colors/nord.vim
index 67f0a3f..6d2e877 100755
--- a/colors/nord.vim
+++ b/colors/nord.vim
@@ -4,7 +4,7 @@
" repository https://github.com/arcticicestudio/nord-vim +
" author Arctic Ice Studio +
" email development@arcticicestudio.com +
-" copyright Copyright (C) 2016 +
+" copyright Copyright (C) 2017 +
" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
if version > 580
hi clear
@@ -14,7 +14,7 @@ if version > 580
endif
let g:colors_name = "nord"
-let s:nord_vim_version="0.3.0"
+let s:nord_vim_version="0.4.0"
set background=dark
let s:nord0_gui = "#2E3440"
@@ -48,7 +48,16 @@ let s:nord13_term = "3"
let s:nord14_term = "2"
let s:nord15_term = "5"
+if !exists('g:nord_italic_comments')
+ let g:nord_italic_comments = 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'
+ let l:attr= 'NONE'
+ endif
+
if a:guifg != ""
exec "hi " . a:group . " guifg=" . a:guifg
endif
@@ -62,7 +71,7 @@ function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
exec "hi " . a:group . " ctermbg=" . a:ctermbg
endif
if a:attr != ""
- exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+ exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
endif
if a:guisp != ""
exec "hi " . a:group . " guisp=" . a:guisp
@@ -137,7 +146,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, "", "", "")
+call s:hi("Comment", s:nord3_gui, "", 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, "", "", "")
@@ -155,7 +164,7 @@ call s:hi("PreProc", s:nord9_gui, "", s:nord9_term, "", "NONE", "")
call s:hi("Repeat", s:nord9_gui, "", s:nord9_term, "", "", "")
call s:hi("Special", s:nord4_gui, "", "NONE", "", "", "")
call s:hi("SpecialChar", s:nord13_gui, "", s:nord13_term, "", "", "")
-call s:hi("SpecialComment", s:nord8_gui, "", s:nord8_term, "", "", "")
+call s:hi("SpecialComment", s:nord8_gui, "", s:nord8_term, "", "italic", "")
call s:hi("Statement", s:nord9_gui, "", s:nord9_term, "", "", "")
call s:hi("StorageClass", s:nord9_gui, "", s:nord9_term, "", "", "")
call s:hi("String", s:nord14_gui, "", s:nord14_term, "", "", "")
@@ -170,6 +179,23 @@ hi! link PreCondit PreProc
"+-----------+
"+ Languages +
"+-----------+
+call s:hi("awkCharClass", s:nord7_gui, "", s:nord7_term, "", "", "")
+call s:hi("awkPatterns", s:nord9_gui, "", s:nord9_term, "", "bold", "")
+hi! link awkArrayElement Identifier
+hi! link awkBoolLogic Keyword
+hi! link awkBrktRegExp SpecialChar
+hi! link awkComma Delimiter
+hi! link awkExpression Keyword
+hi! link awkFieldVars Identifier
+hi! link awkLineSkip Keyword
+hi! link awkOperator Operator
+hi! link awkRegExp SpecialChar
+hi! link awkSearch Keyword
+hi! link awkSemicolon Delimiter
+hi! link awkSpecialCharacter SpecialChar
+hi! link awkSpecialPrintf SpecialChar
+hi! link awkVariables Identifier
+
call s:hi("cIncluded", s:nord7_gui, "", s:nord7_term, "", "", "")
hi! link cOperator Operator
hi! link cPreCondit PreCondit
@@ -191,6 +217,9 @@ hi! link cssPseudoClass cssDefinition
hi! link cssPseudoClassId cssPseudoClass
hi! link cssVendor Keyword
+call s:hi("dosiniHeader", s:nord8_gui, "", s:nord8_term, "", "", "")
+hi! link dosiniLabel Type
+
call s:hi("dtBooleanKey", s:nord7_gui, "", s:nord7_term, "", "", "")
call s:hi("dtExecKey", s:nord7_gui, "", s:nord7_term, "", "", "")
call s:hi("dtLocaleKey", s:nord7_gui, "", s:nord7_term, "", "", "")
@@ -238,6 +267,12 @@ hi! link lessCssAttribute Delimiter
hi! link lessFunction Function
hi! link cssSelectorOp Keyword
+hi! link lispAtomBarSymbol SpecialChar
+hi! link lispAtomList SpecialChar
+hi! link lispAtomMark Keyword
+hi! link lispBarSymbol SpecialChar
+hi! link lispFunc Function
+
hi! link luaFunc Function
call s:hi("markdownBlockquote", s:nord7_gui, "", s:nord7_term, "", "", "")
@@ -246,7 +281,7 @@ call s:hi("markdownCodeDelimiter", s:nord7_gui, "", s:nord7_term, "", "", "")
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: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("markdownUrl", s:nord4_gui, "", "NONE", "", "NONE", "")
hi! link markdownFootnoteDefinition markdownFootnote
@@ -274,6 +309,7 @@ call s:hi("podVerbatimLine", s:nord4_gui, "", "NONE", "", "", "")
hi! link podFormat Keyword
hi! link pythonBuiltin Type
+hi! link pythonEscape SpecialChar
call s:hi("rubyConstant", s:nord7_gui, "", s:nord7_term, "", "", "")
hi! link rubyAttribute Identifier
@@ -304,6 +340,7 @@ hi! link shDerefSimple Identifier
hi! link shDerefVar Identifier
hi! link sqlKeyword Keyword
+hi! link sqlSpecial Keyword
call s:hi("vimAugroup", s:nord7_gui, "", s:nord7_term, "", "", "")
call s:hi("vimMapRhs", s:nord7_gui, "", s:nord7_term, "", "", "")
@@ -338,6 +375,10 @@ call s:hi("GitGutterChange", s:nord13_gui, "", s:nord13_term, "", "", "")
call s:hi("GitGutterChangeDelete", s:nord11_gui, "", s:nord11_term, "", "", "")
call s:hi("GitGutterDelete", s:nord11_gui, "", s:nord11_term, "", "", "")
+" davidhalter/jedi-vim
+call s:hi("jediFunction", s:nord4_gui, s:nord3_gui, "", s:nord3_term, "", "")
+call s:hi("jediFat", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "bold,underline", "")
+
" NERDTree
" > scrooloose/nerdtree
call s:hi("NERDTreeExecFile", s:nord7_gui, "", s:nord7_term, "", "", "")