Skip to content

Commit

Permalink
Merge branch 'release/0.10.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
arcticicestudio committed Mar 21, 2019
2 parents 968620c + 0707af4 commit bfa069b
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 24 deletions.
35 changes: 35 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,35 @@

---

# 0.10.0

![Release Date: 2019-03-21](https://img.shields.io/badge/Release_Date-2019--03--21-88C0D0.svg?style=flat-square) [![Project Board](https://img.shields.io/badge/Project_Board-0.10.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/projects/15) [![Milestone](https://img.shields.io/badge/Milestone-0.10.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/milestone/12)

## Features

**Vim 8 terminal highlighting**#125#126 (⊶ 83f8c260) by [@cg433n][gh-user-cg433n]
↠ Added support for the Vim's built-in terminal (`:terminal`) that comes with version 8.0.0 and higher.

## Improvements

**Comment Color Brightness**#145#146 (⊶ 9e0249ca)
↠ Implemented the increase of the comment color (`nord3`) brightness by 10% from a lightness level of ~35% to ~45%.

**Please see [arcticicestudio/nord#94][gh-nord#94] for all details about this design change decision**!

**NOTE**: This change also **deprecates the [comment contrast][readme-config-comment-brightness] configuration** that will be removed in Nord Vim version 1.0.0!
The default comment color has been adjusted so the configuration is not required anymore for users to increase the brightness on their own.
To notify users about this change a deprecation warning will be shown when the `g:nord_comment_brightness` configuration variable has been set and initialized through the user's configuration.

## Improvements

**Improved compatibility of airline with tmuxline.vim plugin**#117#128 (⊶ 3150628f)
↠ The [Nord airline.vim][gh-src-airline] UI plugin theme now includes better support for the [tmuxline.vim][gh-tmuxline.vim] plugin. Previously text shown in the main segment of the _tmuxline_, generated via the `:Tmuxline airline` command, caused a `bad colour: NONE` error or has been colorized using `nord0` which resulted in unreadable text due to a `nord3` background.

This has been fixed by using `nord5` as foreground color. …[#11][gh-11] was used as implementation reference since it fixed the same incompatibility for the [lightline.vim][gh-lightline.vim] plugin.

![](https://user-images.githubusercontent.com/7836623/41835439-e3f2388c-7857-11e8-91e0-a0440b7ecf35.png)

# 0.9.0

![Release Date: 2018-06-24](https://img.shields.io/badge/Release_Date-2018--06--24-88C0D0.svg?style=flat-square) [![Project Board](https://img.shields.io/badge/Project_Board-0.9.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/projects/13) [![Milestone](https://img.shields.io/badge/Milestone-0.9.0-88C0D0.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/milestone/11)
Expand Down Expand Up @@ -454,7 +483,13 @@ Detailed information about features, supported plugins/languages and install ins

![Release Date: 2016-12-25](https://img.shields.io/badge/Release_Date-2016--12--25-88C0D0.svg?style=flat-square)

[gh-11]: https://github.com/arcticicestudio/nord-vim/issues/11
[gh-55-arcticicestudio/nord]: https://github.com/arcticicestudio/nord/issues/55
[gh-lightline.vim]: https://github.com/itchyny/lightline.vim
[gh-nord#94]: https://github.com/arcticicestudio/nord/issues/94
[gh-src-airline]: https://github.com/arcticicestudio/nord-vim/blob/develop/autoload/airline/themes/nord.vim
[gh-tmuxline.vim]: https://github.com/edkolev/tmuxline.vim
[gh-user-cg433n]: https://github.com/cg433n
[gist-colors-in-terminals]: https://gist.github.com/XVilka/8346728
[itchyny/lightline.vim-gh-257]: https://github.com/itchyny/lightline.vim/pull/257
[itchyny/lightline-adv-config]: https://github.com/itchyny/lightline.vim#advanced-configuration
Expand Down
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
MIT License (MIT)

Copyright (c) 2016-present Arctic Ice Studio <[email protected]> (http://arcticicestudio.com)
Copyright (c) 2016-present Sven Greb <code@svengreb.de> (http://svengreb.de)
Copyright (C) 2016-present Arctic Ice Studio <[email protected]> (https://www.arcticicestudio.com)
Copyright (C) 2016-present Sven Greb <development@svengreb.de> (https://www.svengreb.de)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Plug 'arcticicestudio/nord-vim', { 'branch': 'develop' }
A explicit version can be installed via Git tags:
```vim
Plug 'arcticicestudio/nord-vim', { 'tag': 'v0.9.0' }
Plug 'arcticicestudio/nord-vim', { 'tag': 'v0.10.0' }
```
#### Manual
Expand Down Expand Up @@ -301,7 +301,7 @@ Detailed descriptions for supported languages can be found in the [project wiki]
## Development
[![](https://img.shields.io/badge/Changelog-0.9.0-81A1C1.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/blob/v0.9.0/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-81A1C1.svg?style=flat-square)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-81A1C1.svg?style=flat-square)](https://github.com/arcticicestudio/arcver)
[![](https://img.shields.io/badge/Changelog-0.10.0-81A1C1.svg?style=flat-square)](https://github.com/arcticicestudio/nord-vim/blob/v0.10.0/CHANGELOG.md#0100) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-81A1C1.svg?style=flat-square)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-81A1C1.svg?style=flat-square)](https://github.com/arcticicestudio/arcver)
### Contribution
Expand Down
20 changes: 10 additions & 10 deletions autoload/airline/themes/nord.vim
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
" Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
" Copyright (c) 2016-present Sven Greb <code@svengreb.de>
" Copyright (C) 2016-present Arctic Ice Studio <[email protected]>
" Copyright (C) 2016-present Sven Greb <development@svengreb.de>

" Project: Nord Vim
" Repository: https://github.com/arcticicestudio/nord-vim
" License: MIT

let s:nord_vim_version="0.9.0"
let s:nord_vim_version="0.10.0"
let g:airline#themes#nord#palette = {}

let s:nord0_gui = "#2E3440"
Expand Down Expand Up @@ -44,25 +44,25 @@ let s:nord6_term = "15"

let s:NMain = [s:nord1_gui, s:nord8_gui, s:nord1_term, s:nord8_term]
let s:NRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term]
let s:NMiddle = [s:nord4_gui, s:nord3_gui, s:nord4_term, s:nord3_term]
let s:NMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term]
let g:airline#themes#nord#palette.normal = airline#themes#generate_color_map(s:NMain, s:NRight, s:NMiddle)

let s:IMain = [s:nord1_gui, s:nord14_gui, s:nord1_term, s:nord6_term]
let s:IRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term]
let s:IMiddle = [s:nord4_gui, s:nord3_gui, s:nord4_term, s:nord3_term]
let s:IMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term]
let g:airline#themes#nord#palette.insert = airline#themes#generate_color_map(s:IMain, s:IRight, s:IMiddle)

let s:RMain = [s:nord1_gui, s:nord14_gui, s:nord1_term, s:nord14_term]
let s:RRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term]
let s:RMiddle = [s:nord4_gui, s:nord3_gui, s:nord4_term, s:nord3_term]
let s:RMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term]
let g:airline#themes#nord#palette.replace = airline#themes#generate_color_map(s:RMain, s:RRight, s:RMiddle)

let s:VMain = [s:nord1_gui, s:nord7_gui, s:nord1_term, s:nord7_term]
let s:VRight = [s:nord1_gui, s:nord9_gui, s:nord1_term, s:nord9_term]
let s:VMiddle = [s:nord4_gui, s:nord3_gui, s:nord4_term, s:nord3_term]
let s:VMiddle = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term]
let g:airline#themes#nord#palette.visual = airline#themes#generate_color_map(s:VMain, s:VRight, s:VMiddle)

let s:IAMain = [s:nord4_gui, s:nord3_gui, s:nord4_term, s:nord3_term]
let s:IARight = [s:nord4_gui, s:nord3_gui, s:nord4_term, s:nord3_term]
let s:IAMiddle = [s:nord4_gui, s:nord1_gui, s:nord4_term, s:nord1_term]
let s:IAMain = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term]
let s:IARight = [s:nord5_gui, s:nord3_gui, s:nord5_term, s:nord3_term]
let s:IAMiddle = [s:nord5_gui, s:nord1_gui, s:nord5_term, s:nord1_term]
let g:airline#themes#nord#palette.inactive = airline#themes#generate_color_map(s:IAMain, s:IARight, s:IAMiddle)
6 changes: 3 additions & 3 deletions autoload/lightline/colorscheme/nord.vim
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
" Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
" Copyright (c) 2016-present Sven Greb <code@svengreb.de>
" Copyright (C) 2016-present Arctic Ice Studio <[email protected]>
" Copyright (C) 2016-present Sven Greb <development@svengreb.de>

" Project: Nord Vim
" Repository: https://github.com/arcticicestudio/nord-vim
" License: MIT

let s:nord_vim_version="0.9.0"
let s:nord_vim_version="0.10.0"
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}

let s:nord0 = ["#2E3440", "NONE"]
Expand Down
29 changes: 22 additions & 7 deletions colors/nord.vim
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
" Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
" Copyright (c) 2016-present Sven Greb <code@svengreb.de>
" Copyright (C) 2016-present Arctic Ice Studio <[email protected]>
" Copyright (C) 2016-present Sven Greb <development@svengreb.de>

" Project: Nord Vim
" Repository: https://github.com/arcticicestudio/nord-vim
Expand All @@ -13,13 +13,14 @@ if version > 580
endif

let g:colors_name = "nord"
let s:nord_vim_version="0.9.0"
let s:nord_vim_version="0.10.0"
set background=dark

let s:nord0_gui = "#2E3440"
let s:nord1_gui = "#3B4252"
let s:nord2_gui = "#434C5E"
let s:nord3_gui = "#4C566A"
let s:nord3_gui_bright = "#616E88"
let s:nord4_gui = "#D8DEE9"
let s:nord5_gui = "#E5E9F0"
let s:nord6_gui = "#ECEFF4"
Expand Down Expand Up @@ -100,8 +101,17 @@ if !exists('g:nord_uniform_status_lines')
let g:nord_uniform_status_lines = 0
endif

if !exists("g:nord_comment_brightness")
let g:nord_comment_brightness = 0
function! s:logWarning(msg)
echohl WarningMsg
echomsg 'nord: warning: ' . a:msg
echohl None
endfunction

if exists("g:nord_comment_brightness")
call s:logWarning('Variable g:nord_comment_brightness has been deprecated and will be removed in version 1.0.0!' .
\' The comment color brightness has been increased by 10% by default.' .
\' Please see https://github.com/arcticicestudio/nord-vim/issues/145 for more details.')
let g:nord_comment_brightness = 10
endif

if !exists("g:nord_uniform_diff_background")
Expand Down Expand Up @@ -168,6 +178,11 @@ call s:hi("healthSuccess", s:nord14_gui, s:nord1_gui, s:nord14_term, s:nord1_ter
call s:hi("healthWarning", s:nord13_gui, s:nord1_gui, s:nord13_term, s:nord1_term, "", "")
call s:hi("TermCursorNC", "", s:nord1_gui, "", s:nord1_term, "", "")

"+- Vim 8 Terminal Colors -+
if has('terminal')
let g:terminal_ansi_colors = [s:nord1_gui, s:nord11_gui, s:nord14_gui, s:nord13_gui, s:nord9_gui, s:nord15_gui, s:nord8_gui, s:nord5_gui, s:nord3_gui, s:nord11_gui, s:nord14_gui, s:nord13_gui, s:nord9_gui, s:nord15_gui, s:nord7_gui, s:nord6_gui]
endif

"+- Neovim Terminal Colors -+
if has('nvim')
let g:terminal_color_0 = s:nord1_gui
Expand Down Expand Up @@ -240,7 +255,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_brightened[g:nord_comment_brightness], "", s:nord3_term, "", s:italicize_comments, "")
call s:hi("Comment", s:nord3_gui_bright, "", s:nord3_term, "", s:italicize_comments, "")
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, "", "", "")
Expand Down Expand Up @@ -466,7 +481,7 @@ hi! link vimFunction Function
hi! link vimUserFunc Function

call s:hi("xmlAttrib", s:nord7_gui, "", s:nord7_term, "", "", "")
call s:hi("xmlCdataStart", s:nord3_gui, "", s:nord3_term, "", "bold", "")
call s:hi("xmlCdataStart", s:nord3_gui_bright, "", s:nord3_term, "", "bold", "")
call s:hi("xmlNamespace", s:nord7_gui, "", s:nord7_term, "", "", "")
hi! link xmlAttribPunct Delimiter
hi! link xmlCdata Comment
Expand Down

0 comments on commit bfa069b

Please sign in to comment.