From 096ff7bdefb7388869c38a4df6e582313d87d76a Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Thu, 21 Mar 2019 10:47:48 +0100 Subject: [PATCH 1/2] Update copyright notices and contributor metadata GH-145 --- LICENSE.md | 4 ++-- autoload/airline/themes/nord.vim | 4 ++-- autoload/lightline/colorscheme/nord.vim | 4 ++-- colors/nord.vim | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 34bd7975..eeb5ee1f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,7 @@ MIT License (MIT) -Copyright (c) 2016-present Arctic Ice Studio (http://arcticicestudio.com) -Copyright (c) 2016-present Sven Greb (http://svengreb.de) +Copyright (C) 2016-present Arctic Ice Studio (https://www.arcticicestudio.com) +Copyright (C) 2016-present Sven Greb (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 diff --git a/autoload/airline/themes/nord.vim b/autoload/airline/themes/nord.vim index 560d32a0..a6a68bce 100755 --- a/autoload/airline/themes/nord.vim +++ b/autoload/airline/themes/nord.vim @@ -1,5 +1,5 @@ -" Copyright (c) 2016-present Arctic Ice Studio -" Copyright (c) 2016-present Sven Greb +" Copyright (C) 2016-present Arctic Ice Studio +" Copyright (C) 2016-present Sven Greb " Project: Nord Vim " Repository: https://github.com/arcticicestudio/nord-vim diff --git a/autoload/lightline/colorscheme/nord.vim b/autoload/lightline/colorscheme/nord.vim index 778c21d9..0a52db8b 100755 --- a/autoload/lightline/colorscheme/nord.vim +++ b/autoload/lightline/colorscheme/nord.vim @@ -1,5 +1,5 @@ -" Copyright (c) 2016-present Arctic Ice Studio -" Copyright (c) 2016-present Sven Greb +" Copyright (C) 2016-present Arctic Ice Studio +" Copyright (C) 2016-present Sven Greb " Project: Nord Vim " Repository: https://github.com/arcticicestudio/nord-vim diff --git a/colors/nord.vim b/colors/nord.vim index 552f894d..e03937e2 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -1,5 +1,5 @@ -" Copyright (c) 2016-present Arctic Ice Studio -" Copyright (c) 2016-present Sven Greb +" Copyright (C) 2016-present Arctic Ice Studio +" Copyright (C) 2016-present Sven Greb " Project: Nord Vim " Repository: https://github.com/arcticicestudio/nord-vim From def9d75fee42a44b55a54f28d97258e73dffe14f Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Thu, 21 Mar 2019 10:52:15 +0100 Subject: [PATCH 2/2] Comment Color Brightness -> Please see https://github.com/arcticicestudio/nord/issues/94 for all details about this design change decision. Increased the comment color (`nord3`) brightness by 10% from a lightness level of ~35% to ~45%. This change also deprecates the comment contrast (1) configuration. It is not necessary anymore for users to increase the brightness on their own when the default color has been increased by default. A deprecation warning will be shown to notify all users who have set a custom value for the `g:nord_comment_brightness` configuration variable. References: (1) https://github.com/arcticicestudio/nord-vim#comment-contrast GH-145 --- colors/nord.vim | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/colors/nord.vim b/colors/nord.vim index e03937e2..e71ee5d0 100755 --- a/colors/nord.vim +++ b/colors/nord.vim @@ -20,6 +20,7 @@ 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" @@ -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") @@ -245,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, "", "", "") @@ -471,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