Skip to content

Commit cc1ca97

Browse files
Merge branch 'release/0.4.0'
2 parents ec4a9cb + 6c3e6f0 commit cc1ca97

File tree

5 files changed

+120
-21
lines changed

5 files changed

+120
-21
lines changed

CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,33 @@
44

55
---
66

7+
# 0.4.0
8+
*2017-02-23*
9+
## Features
10+
### [Configurations][readme-configuration]
11+
❯ Added a configuration to enable [italic comments](https://github.com/arcticicestudio/nord-vim#italic-comments).
12+
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`.
13+
```vim
14+
let g:nord_italic_comments = 1
15+
```
16+
(@kepbod, #13 (PR #16), dc6149f4)
17+
18+
## Improvements
19+
### Plugin Support
20+
❯ The method/function signature live preview of the [`jedi-vim`](https://github.com/davidhalter/jedi-vim) plugin is now colorized correctly. (@mkalinski, #14, a5c3459a)
21+
22+
<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>
23+
24+
### Language Support
25+
❯ Implemented optimized styles for the Python syntax group `pythonEscape`. (@mkalinski, #22, 360a76ea)
26+
![ghi-22-scrot-pythonescape](https://cloud.githubusercontent.com/assets/7836623/22618370/ad74e7fc-eada-11e6-89f2-23b351e8aa2b.png)
27+
28+
❯ 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)
29+
30+
### Documentation
31+
❯ Added the new terminal emulator port project [Nord Hyper](https://github.com/arcticicestudio/nord-hyper)
32+
[![Nord Hyper](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-hyper-banner.svg)](https://github.com/arcticicestudio/nord-hyper)
33+
734
# 0.3.0
835
*2017-01-24*
936
## Improvements
@@ -67,3 +94,4 @@ Detailed information about features, supported plugins/languages and install ins
6794
**Project Initialization**
6895

6996
[nord-lightline]: https://github.com/arcticicestudio/nord-vim/blob/develop/autoload/lightline/colorscheme/nord.vim
97+
[readme-configuration]: https://github.com/arcticicestudio/nord-vim#configuration

README.md

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,29 @@ Nord Vim is a 16 colorspace theme build to run in GUI- and terminal mode with su
1313

1414
<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>
1515

16+
- [Getting started](#getting-started)
17+
- [Installation](#installation)
18+
- [Via plugin/runtimepath manager](#via-pluginruntimepath-manager)
19+
- [Manual](#manual)
20+
- [Activation](#activation)
21+
- [Configuration](#configuration)
22+
- [Italic comments](#italic-comments)
23+
- [Plugin Support](#plugin-support)
24+
- [UI Plugins](#ui-plugins)
25+
- [Language Plugins](#language-plugins)
26+
- [JavaScript](#javascript)
27+
- [Languages](#languages)
28+
- [Development](#development)
29+
- [Contribution](#contribution)
30+
1631
## Getting started
1732
### Installation
1833
**NOTE**: Nord Vim in terminal mode **MUST** be used with the associated terminal emulator theme in order to work properly!
1934
Make sure to install one of the currently supported terminal themes listed below **BEFORE** installing Nord Vim.
2035

2136
[![Nord GNOME Terminal](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-gnome-terminal-banner.svg)](https://github.com/arcticicestudio/nord-gnome-terminal)
2237
[![Nord Guake](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-guake-banner.svg)](https://github.com/arcticicestudio/nord-guake)
38+
[![Nord Hyper](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-hyper-banner.svg)](https://github.com/arcticicestudio/nord-hyper)
2339
[![Nord iTerm2](https://cdn.rawgit.com/arcticicestudio/nord/0971858f496823fd916f3368961f16ef2c7aad1e/src/assets/nord-iterm2-banner.svg)](https://github.com/arcticicestudio/nord-iterm2)
2440
[![Nord Konsole](https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/nord-konsole-banner.svg)](https://github.com/arcticicestudio/nord-konsole)
2541
[![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
3450
#### Via plugin/runtimepath manager
3551
I recommend to use [`vim-plug`](https://github.com/junegunn/vim-plug).
3652
Add Nord Vim to your `.vimrc`
37-
```sh
53+
```vim
3854
Plug 'arcticicestudio/nord-vim'
3955
```
4056
and install via `:PlugInstall`.
4157

4258
You can specify the `develop` branch to install the latest development version.
43-
```sh
59+
```vim
4460
Plug 'arcticicestudio/nord-vim', { 'branch': 'develop' }
4561
```
4662

4763
A specific version can be installed via git tags.
48-
```sh
49-
Plug 'arcticicestudio/nord-vim', { 'tag': 'v0.3.0' }
64+
```vim
65+
Plug 'arcticicestudio/nord-vim', { 'tag': 'v0.4.0' }
5066
```
5167

5268
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
5874

5975
[`Vundle`](https://github.com/VundleVim/Vundle.vim)
6076
Add Nord Vim to your `.vimrc`
61-
```sh
77+
```vim
6278
Plugin 'arcticicestudio/nord-vim'
6379
```
6480
and install via `:PluginInstall`.
@@ -68,22 +84,36 @@ and install via `:PluginInstall`.
6884

6985
### Activation
7086
Use Nord Vim as your default color theme by adding it to your `.vimrc`
71-
```sh
87+
```vim
7288
colorscheme nord
7389
```
7490
or change it on-the-fly by running `:colorscheme nord`.
7591

7692
[`vim-plug`](https://github.com/junegunn/vim-plug) also provides options to enable it on-demand for specific languages
77-
```sh
93+
```vim
7894
" Activate Nord Vim when editing Java files
7995
Plug 'arcticicestudio/nord-vim', { 'for': 'java' }
8096
```
8197
or on specific events.
82-
```sh
98+
```vim
8399
" Activate Nord Vim when toggling the NERDTree
84100
Plug 'arcticicestudio/nord-vim', { 'on': 'NERDTreeToggle' }
85101
```
86102

103+
## Configuration
104+
All options should be set **before** the [activation](#activation) command!
105+
106+
### Italic comments
107+
**This option should only be enabled if your terminal emulator supports italics!**
108+
109+
Enable to use italic font for all comments.
110+
111+
To adhere to the Nord style guide this option is disabled by default.
112+
It can be enabled by setting the `g:nord_italic_comments` variable to `1`.
113+
```vim
114+
let g:nord_italic_comments = 1
115+
```
116+
87117
## Plugin Support
88118
Nord Vim provides support for many third-party language- and the UI plugins.
89119

@@ -118,16 +148,16 @@ Detailed descriptions for supported languages can be found in the [project wiki]
118148
![][scrot-lang-ruby]
119149

120150
## Development
121-
[![](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)
151+
[![](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)
122152

123153
### Contribution
124154
Please report issues/bugs, feature requests and suggestions for improvements to the [issue tracker](https://github.com/arcticicestudio/nord-vim/issues).
125155

126156
<p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/banner-footer-mountains.svg" /></p>
127157

128-
<p align="center"> <img src="http://arcticicestudio.com/favicon.ico" width=16 height=16/> Copyright &copy; 2016 Arctic Ice Studio</p>
158+
<p align="center"> <img src="http://arcticicestudio.com/favicon.ico" width=16 height=16/> Copyright &copy; 2017 Arctic Ice Studio</p>
129159

130-
<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>
160+
<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>
131161

132162
[scrot-readme-default-profile]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/src/assets/scrot-readme-default-profile.png
133163
[scrot-readme-lazy-profile-change]: https://raw.githubusercontent.com/arcticicestudio/nord-vim/develop/src/assets/scrot-readme-lazy-profile-change.png

autoload/airline/themes/nord.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
" repository https://github.com/arcticicestudio/nord-vim +
55
" author Arctic Ice Studio +
66
" email development@arcticicestudio.com +
7-
" copyright Copyright (C) 2016 +
7+
" copyright Copyright (C) 2017 +
88
" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
9-
let s:nord_vim_version="0.3.0"
9+
let s:nord_vim_version="0.4.0"
1010
let g:airline#themes#nord#palette = {}
1111

1212
let s:nord0_gui = "#2E3440"

autoload/lightline/colorscheme/nord.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
" repository https://github.com/arcticicestudio/nord-vim +
55
" author Arctic Ice Studio +
66
" email development@arcticicestudio.com +
7-
" copyright Copyright (C) 2016 +
7+
" copyright Copyright (C) 2017 +
88
" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
9-
let s:nord_vim_version="0.3.0"
9+
let s:nord_vim_version="0.4.0"
1010
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
1111

1212
let s:nord0 = ["#2E3440", "NONE"]

colors/nord.vim

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
" repository https://github.com/arcticicestudio/nord-vim +
55
" author Arctic Ice Studio +
66
" email development@arcticicestudio.com +
7-
" copyright Copyright (C) 2016 +
7+
" copyright Copyright (C) 2017 +
88
" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
99
if version > 580
1010
hi clear
@@ -14,7 +14,7 @@ if version > 580
1414
endif
1515

1616
let g:colors_name = "nord"
17-
let s:nord_vim_version="0.3.0"
17+
let s:nord_vim_version="0.4.0"
1818
set background=dark
1919

2020
let s:nord0_gui = "#2E3440"
@@ -48,7 +48,16 @@ let s:nord13_term = "3"
4848
let s:nord14_term = "2"
4949
let s:nord15_term = "5"
5050

51+
if !exists('g:nord_italic_comments')
52+
let g:nord_italic_comments = 0
53+
endif
54+
5155
function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
56+
let l:attr = a:attr
57+
if g:nord_italic_comments == 0 && l:attr ==? 'italic'
58+
let l:attr= 'NONE'
59+
endif
60+
5261
if a:guifg != ""
5362
exec "hi " . a:group . " guifg=" . a:guifg
5463
endif
@@ -62,7 +71,7 @@ function! s:hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
6271
exec "hi " . a:group . " ctermbg=" . a:ctermbg
6372
endif
6473
if a:attr != ""
65-
exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
74+
exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
6675
endif
6776
if a:guisp != ""
6877
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
137146
"+----------------------+
138147
call s:hi("Boolean", s:nord9_gui, "", s:nord9_term, "", "", "")
139148
call s:hi("Character", s:nord14_gui, "", s:nord14_term, "", "", "")
140-
call s:hi("Comment", s:nord3_gui, "", s:nord3_term, "", "", "")
149+
call s:hi("Comment", s:nord3_gui, "", s:nord3_term, "", "italic", "")
141150
call s:hi("Conditional", s:nord9_gui, "", s:nord9_term, "", "", "")
142151
call s:hi("Constant", s:nord4_gui, "", "NONE", "", "", "")
143152
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", "")
155164
call s:hi("Repeat", s:nord9_gui, "", s:nord9_term, "", "", "")
156165
call s:hi("Special", s:nord4_gui, "", "NONE", "", "", "")
157166
call s:hi("SpecialChar", s:nord13_gui, "", s:nord13_term, "", "", "")
158-
call s:hi("SpecialComment", s:nord8_gui, "", s:nord8_term, "", "", "")
167+
call s:hi("SpecialComment", s:nord8_gui, "", s:nord8_term, "", "italic", "")
159168
call s:hi("Statement", s:nord9_gui, "", s:nord9_term, "", "", "")
160169
call s:hi("StorageClass", s:nord9_gui, "", s:nord9_term, "", "", "")
161170
call s:hi("String", s:nord14_gui, "", s:nord14_term, "", "", "")
@@ -170,6 +179,23 @@ hi! link PreCondit PreProc
170179
"+-----------+
171180
"+ Languages +
172181
"+-----------+
182+
call s:hi("awkCharClass", s:nord7_gui, "", s:nord7_term, "", "", "")
183+
call s:hi("awkPatterns", s:nord9_gui, "", s:nord9_term, "", "bold", "")
184+
hi! link awkArrayElement Identifier
185+
hi! link awkBoolLogic Keyword
186+
hi! link awkBrktRegExp SpecialChar
187+
hi! link awkComma Delimiter
188+
hi! link awkExpression Keyword
189+
hi! link awkFieldVars Identifier
190+
hi! link awkLineSkip Keyword
191+
hi! link awkOperator Operator
192+
hi! link awkRegExp SpecialChar
193+
hi! link awkSearch Keyword
194+
hi! link awkSemicolon Delimiter
195+
hi! link awkSpecialCharacter SpecialChar
196+
hi! link awkSpecialPrintf SpecialChar
197+
hi! link awkVariables Identifier
198+
173199
call s:hi("cIncluded", s:nord7_gui, "", s:nord7_term, "", "", "")
174200
hi! link cOperator Operator
175201
hi! link cPreCondit PreCondit
@@ -191,6 +217,9 @@ hi! link cssPseudoClass cssDefinition
191217
hi! link cssPseudoClassId cssPseudoClass
192218
hi! link cssVendor Keyword
193219

220+
call s:hi("dosiniHeader", s:nord8_gui, "", s:nord8_term, "", "", "")
221+
hi! link dosiniLabel Type
222+
194223
call s:hi("dtBooleanKey", s:nord7_gui, "", s:nord7_term, "", "", "")
195224
call s:hi("dtExecKey", s:nord7_gui, "", s:nord7_term, "", "", "")
196225
call s:hi("dtLocaleKey", s:nord7_gui, "", s:nord7_term, "", "", "")
@@ -238,6 +267,12 @@ hi! link lessCssAttribute Delimiter
238267
hi! link lessFunction Function
239268
hi! link cssSelectorOp Keyword
240269

270+
hi! link lispAtomBarSymbol SpecialChar
271+
hi! link lispAtomList SpecialChar
272+
hi! link lispAtomMark Keyword
273+
hi! link lispBarSymbol SpecialChar
274+
hi! link lispFunc Function
275+
241276
hi! link luaFunc Function
242277

243278
call s:hi("markdownBlockquote", s:nord7_gui, "", s:nord7_term, "", "", "")
@@ -246,7 +281,7 @@ call s:hi("markdownCodeDelimiter", s:nord7_gui, "", s:nord7_term, "", "", "")
246281
call s:hi("markdownFootnote", s:nord7_gui, "", s:nord7_term, "", "", "")
247282
call s:hi("markdownId", s:nord7_gui, "", s:nord7_term, "", "", "")
248283
call s:hi("markdownIdDeclaration", s:nord7_gui, "", s:nord7_term, "", "", "")
249-
call s:hi("markdownH1", s:nord7_gui, "", s:nord7_term, "", "", "")
284+
call s:hi("markdownH1", s:nord8_gui, "", s:nord8_term, "", "", "")
250285
call s:hi("markdownLinkText", s:nord7_gui, "", s:nord7_term, "", "", "")
251286
call s:hi("markdownUrl", s:nord4_gui, "", "NONE", "", "NONE", "")
252287
hi! link markdownFootnoteDefinition markdownFootnote
@@ -274,6 +309,7 @@ call s:hi("podVerbatimLine", s:nord4_gui, "", "NONE", "", "", "")
274309
hi! link podFormat Keyword
275310

276311
hi! link pythonBuiltin Type
312+
hi! link pythonEscape SpecialChar
277313

278314
call s:hi("rubyConstant", s:nord7_gui, "", s:nord7_term, "", "", "")
279315
hi! link rubyAttribute Identifier
@@ -304,6 +340,7 @@ hi! link shDerefSimple Identifier
304340
hi! link shDerefVar Identifier
305341

306342
hi! link sqlKeyword Keyword
343+
hi! link sqlSpecial Keyword
307344

308345
call s:hi("vimAugroup", s:nord7_gui, "", s:nord7_term, "", "", "")
309346
call s:hi("vimMapRhs", s:nord7_gui, "", s:nord7_term, "", "", "")
@@ -338,6 +375,10 @@ call s:hi("GitGutterChange", s:nord13_gui, "", s:nord13_term, "", "", "")
338375
call s:hi("GitGutterChangeDelete", s:nord11_gui, "", s:nord11_term, "", "", "")
339376
call s:hi("GitGutterDelete", s:nord11_gui, "", s:nord11_term, "", "", "")
340377

378+
" davidhalter/jedi-vim
379+
call s:hi("jediFunction", s:nord4_gui, s:nord3_gui, "", s:nord3_term, "", "")
380+
call s:hi("jediFat", s:nord8_gui, s:nord3_gui, s:nord8_term, s:nord3_term, "bold,underline", "")
381+
341382
" NERDTree
342383
" > scrooloose/nerdtree
343384
call s:hi("NERDTreeExecFile", s:nord7_gui, "", s:nord7_term, "", "", "")

0 commit comments

Comments
 (0)