Skip to content

Commit

Permalink
Merge branch 'release/0.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@arcticicestudio
arcticicestudio committed Jan 8, 2020
2 parents ba8f9b9 + 72df920 commit 0f5295f
Show file tree
Hide file tree
Showing 2 changed files with 135 additions and 41 deletions.
70 changes: 70 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,57 @@

<!--lint disable no-duplicate-headings-->

# 0.5.0

![Release Date: 2020-01-08](https://img.shields.io/static/v1.svg?style=flat-square&label=Release%20Date&message=2020-01-08&colorA=4c566a&colorB=88c0d0) [![Project Board](https://img.shields.io/static/v1.svg?style=flat-square&label=Project%20Board&message=0.5.0&colorA=4c566a&colorB=88c0d0)](https://github.com/arcticicestudio/nord-vim/projects/11) [![Milestone](https://img.shields.io/static/v1.svg?style=flat-square&label=Milestone&message=0.5.0&colorA=4c566a&colorB=88c0d0)](https://github.com/arcticicestudio/nord-vim/milestone/7)

## Feature

**Support for _ivy-mode_** — #85 ⇄ #87 (⊶ d59f37c9) by [@jdek][gh-user-jdek]
↠ Added support for the [_ivy-mode_][abo-abo/swiper] of the [ivy][melpa-ivy] package.
It makes use of background to foreground color shading as main accent to highlight matches.

<p align="center"><strong>Before</strong></p>
<p align="center"><img src="https://user-images.githubusercontent.com/7836623/71962257-5de30c00-31f9-11ea-8c7b-521000e21322.png" /></p>

<p align="center"><strong>After</strong></p>
<p align="center"><img src="https://user-images.githubusercontent.com/7836623/71822147-6cfc7980-3094-11ea-9c7c-b3bc7f268a6d.png" /></p>

**Migrate deprecated `show-paren-X-face` faces** — #75 ⇄ #89 (⊶ a2b90386) by [@janusvm][gh-user-janusvm]
↠ The `show-paren-match-face` and `show-paren-mismatch-face` face are [deprecated since Emacs version 22.1][emacs-git-c-c430f7e2] and were [removed in Emacs 25][emacs-gh-c-c430f7e2].
To provide compatibility to later Emacs version, the new `show-paren-match` and `show-paren-mismatch` faces have been added.

The deprecated faces will be removed later on, but for now its totally fine for both faces to co-exist to support Emacs versions <22.1 as well as >=22.1.

**Support _Cider_ evaluation result in terminal** — #70 ⇄ #71 (⊶ 995d8421) by [@fmnoise][gh-user-fmnoise]
↠ Added support for evaluation result highlighting of the [Cider][clojure-emacs/cider] package. When running in Emacs GUI mode through iTerm2 on macOS, the background and font color in the evaluation result overlay were the same (or very similar) color so it became unreadable.
Probably that's because of the [defined `cider-result-overlay-face` face][clojure-emacs/cider@f6ac1594#l35] and a difference in the rendering engine of iTerm2.

<p align="center"><strong>Before</strong></p>
<p align="center"><img src="https://user-images.githubusercontent.com/7836623/71961954-c2519b80-31f8-11ea-944a-7584503790aa.png" /></p>

To prevent this problem, the background color has been removed by using the `unspecified` keyword for the `:background` attribute.

## Improvements

**Different colors for _Org-Mode_ headings** — #81 (⊶ e095a86a) by [@C0DK][gh-user-c0dk]
↠ The different [Org-Mode][org-mode-docs-headings] headings are now using the whole Nord's [Frost][nord-docs-colors#frost] color palette instead of only using `nord8`.

<p align="center"><strong>Before</strong></p>
<p align="center"><img src="https://user-images.githubusercontent.com/7836623/71960310-f62ac200-31f4-11ea-857c-a8a0051d99a1.png" /></p>

<p align="center"><strong>After</strong></p>
<p align="center"><img src="https://user-images.githubusercontent.com/7836623/71960309-f62ac200-31f4-11ea-98f5-a7d4d4b0db86.png" /></p>

**Use `display-color-cells` to enable 24-bit color terminal support** — #59 ⇄ #64, #88 (⊶ a66c1202) by [@visigoth][gh-user-visigoth]
↠ In order to fix the „unable to load color X” errors when running Emacs in daemon-mode, the defined theme colors are now tested against the [`display-color-cells` „display feature testing“ function][emacs-docs-display_feature_test] to support 24-bit color terminals with a fallback to the `display-graphic-p` function.
This is a first step to fix the problems described and tracked in #59.

## Bug Fixes

**Superfluous brace character introduced in #81** — #82 (⊶ 2fc8fe41) by [@rien333][gh-user-rien333]
↠ Removed a superfluous brace character (introduced in #81) that caused the theme fail to load.

# 0.4.0

![Release Date: 2019-06-16](https://img.shields.io/static/v1.svg?style=flat-square&label=Release%20Date&message=2016-06-16&colorA=4c566a&colorB=88c0d0) [![Project Board](https://img.shields.io/static/v1.svg?style=flat-square&label=Project%20Board&message=0.4.0&colorA=4c566a&colorB=88c0d0)](https://github.com/arcticicestudio/nord-vim/projects/8) [![Milestone](https://img.shields.io/static/v1.svg?style=flat-square&label=Milestone&message=0.4.0&colorA=4c566a&colorB=88c0d0)](https://github.com/arcticicestudio/nord-vim/milestone/6)
Expand Down Expand Up @@ -257,8 +308,11 @@ _2017-03-25_

[gh-nord]: https://github.com/arcticicestudio/nord
[nord-docs-colors#frost]: https://www.nordtheme.com/docs/colors-and-palettes#frost
[nord-docs-colors#frost]: https://www.nordtheme.com/docs/colors-and-palettes#frost
[nord-docs-colors#snowstorm]: https://www.nordtheme.com/docs/colors-and-palettes#snow-storm
[nord]: https://www.nordtheme.com
[org-mode-docs-headings]: https://orgmode.org/guide/Headings-and-sections.html
[org-mode]: https://orgmode.org

<!--v 0.4.0 -->

Expand All @@ -270,3 +324,19 @@ _2017-03-25_
[gh-user-gguimaraesbr]: https://github.com/gguimaraesbr
[gh-user-localredhead]: https://github.com/localredhead
[gh-user-slippycheeze]: https://github.com/slippycheeze

<!--v 0.5.0 -->

[abo-abo/swiper]: https://github.com/abo-abo/swiper
[clojure-emacs/cider]: https://github.com/clojure-emacs/cider
[clojure-emacs/cider@f6ac1594#l35]: https://github.com/clojure-emacs/cider/blob/f6ac1594eb20b0d3b9f9b7601e3d2708346dc0bb/cider-overlays.el#L35
[emacs-docs-display_feature_test]: https://www.gnu.org/software/emacs/manual/html_node/elisp/Display-Feature-Testing.html
[emacs-gh-c-c430f7e2]: https://github.com/emacs-mirror/emacs/commit/c430f7e23fc2c22f251ace4254e37dea1452dfc3
[emacs-git-c-c430f7e2]: http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=c430f7e23fc2c22f251ace4254e37dea1452dfc3
[gh-user-c0dk]: https://github.com/C0DK
[gh-user-fmnoise]: https://github.com/fmnoise
[gh-user-janusvm]: https://github.com/janusvm
[gh-user-jdek]: https://github.com/jdek
[gh-user-rien333]: https://github.com/rien333
[gh-user-visigoth]: https://github.com/visigoth
[melpa-ivy]: https://melpa.org/#/ivy
106 changes: 65 additions & 41 deletions nord-theme.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

;; Title: Nord Theme
;; Project: nord-emacs
;; Version: 0.4.0
;; Version: 0.5.0
;; URL: https://github.com/arcticicestudio/nord-emacs
;; Author: Arctic Ice Studio <[email protected]>
;; Package-Requires: ((emacs "24"))
Expand Down Expand Up @@ -93,39 +93,43 @@
Please see https://github.com/arcticicestudio/nord-emacs/issues/73 for more details."
"0.4.0")

(defun nord-display-truecolor-or-graphic-p ()
"Returns whether the display can display nord colors"
(or (= (display-color-cells) 16777216) (display-graphic-p)))

;;;; Color Constants
(let ((class '((class color) (min-colors 89)))
(nord0 (if (display-graphic-p) "#2E3440" nil))
(nord1 (if (display-graphic-p) "#3B4252" "black"))
(nord2 (if (display-graphic-p) "#434C5E" "#434C5E"))
(nord3 (if (display-graphic-p) "#4C566A" "brightblack"))
(nord4 (if (display-graphic-p) "#D8DEE9" "#D8DEE9"))
(nord5 (if (display-graphic-p) "#E5E9F0" "white"))
(nord6 (if (display-graphic-p) "#ECEFF4" "brightwhite"))
(nord7 (if (display-graphic-p) "#8FBCBB" "cyan"))
(nord8 (if (display-graphic-p) "#88C0D0" "brightcyan"))
(nord9 (if (display-graphic-p) "#81A1C1" "blue"))
(nord10 (if (display-graphic-p) "#5E81AC" "brightblue"))
(nord11 (if (display-graphic-p) "#BF616A" "red"))
(nord12 (if (display-graphic-p) "#D08770" "brightyellow"))
(nord13 (if (display-graphic-p) "#EBCB8B" "yellow"))
(nord14 (if (display-graphic-p) "#A3BE8C" "green"))
(nord15 (if (display-graphic-p) "#B48EAD" "magenta"))
(nord-annotation (if (display-graphic-p) "#D08770" "brightyellow"))
(nord-attribute (if (display-graphic-p) "#8FBCBB" "cyan"))
(nord-class (if (display-graphic-p) "#8FBCBB" "cyan"))
(nord-comment (if (display-graphic-p) (nord-theme--brightened-comment-color nord-comment-brightness) "brightblack"))
(nord-escape (if (display-graphic-p) "#D08770" "brightyellow"))
(nord-method (if (display-graphic-p) "#88C0D0" "brightcyan"))
(nord-keyword (if (display-graphic-p) "#81A1C1" "blue"))
(nord-numeric (if (display-graphic-p) "#B48EAD" "magenta"))
(nord-operator (if (display-graphic-p) "#81A1C1" "blue"))
(nord-preprocessor (if (display-graphic-p) "#5E81AC" "brightblue"))
(nord-punctuation (if (display-graphic-p) "#D8DEE9" "#D8DEE9"))
(nord-regexp (if (display-graphic-p) "#EBCB8B" "yellow"))
(nord-string (if (display-graphic-p) "#A3BE8C" "green"))
(nord-tag (if (display-graphic-p) "#81A1C1" "blue"))
(nord-variable (if (display-graphic-p) "#D8DEE9" "#D8DEE9"))
(nord0 (if (nord-display-truecolor-or-graphic-p) "#2E3440" nil))
(nord1 (if (nord-display-truecolor-or-graphic-p) "#3B4252" "black"))
(nord2 (if (nord-display-truecolor-or-graphic-p) "#434C5E" "#434C5E"))
(nord3 (if (nord-display-truecolor-or-graphic-p) "#4C566A" "brightblack"))
(nord4 (if (nord-display-truecolor-or-graphic-p) "#D8DEE9" "#D8DEE9"))
(nord5 (if (nord-display-truecolor-or-graphic-p) "#E5E9F0" "white"))
(nord6 (if (nord-display-truecolor-or-graphic-p) "#ECEFF4" "brightwhite"))
(nord7 (if (nord-display-truecolor-or-graphic-p) "#8FBCBB" "cyan"))
(nord8 (if (nord-display-truecolor-or-graphic-p) "#88C0D0" "brightcyan"))
(nord9 (if (nord-display-truecolor-or-graphic-p) "#81A1C1" "blue"))
(nord10 (if (nord-display-truecolor-or-graphic-p) "#5E81AC" "brightblue"))
(nord11 (if (nord-display-truecolor-or-graphic-p) "#BF616A" "red"))
(nord12 (if (nord-display-truecolor-or-graphic-p) "#D08770" "brightyellow"))
(nord13 (if (nord-display-truecolor-or-graphic-p) "#EBCB8B" "yellow"))
(nord14 (if (nord-display-truecolor-or-graphic-p) "#A3BE8C" "green"))
(nord15 (if (nord-display-truecolor-or-graphic-p) "#B48EAD" "magenta"))
(nord-annotation (if (nord-display-truecolor-or-graphic-p) "#D08770" "brightyellow"))
(nord-attribute (if (nord-display-truecolor-or-graphic-p) "#8FBCBB" "cyan"))
(nord-class (if (nord-display-truecolor-or-graphic-p) "#8FBCBB" "cyan"))
(nord-comment (if (nord-display-truecolor-or-graphic-p) (nord-theme--brightened-comment-color nord-comment-brightness) "brightblack"))
(nord-escape (if (nord-display-truecolor-or-graphic-p) "#D08770" "brightyellow"))
(nord-method (if (nord-display-truecolor-or-graphic-p) "#88C0D0" "brightcyan"))
(nord-keyword (if (nord-display-truecolor-or-graphic-p) "#81A1C1" "blue"))
(nord-numeric (if (nord-display-truecolor-or-graphic-p) "#B48EAD" "magenta"))
(nord-operator (if (nord-display-truecolor-or-graphic-p) "#81A1C1" "blue"))
(nord-preprocessor (if (nord-display-truecolor-or-graphic-p) "#5E81AC" "brightblue"))
(nord-punctuation (if (nord-display-truecolor-or-graphic-p) "#D8DEE9" "#D8DEE9"))
(nord-regexp (if (nord-display-truecolor-or-graphic-p) "#EBCB8B" "yellow"))
(nord-string (if (nord-display-truecolor-or-graphic-p) "#A3BE8C" "green"))
(nord-tag (if (nord-display-truecolor-or-graphic-p) "#81A1C1" "blue"))
(nord-variable (if (nord-display-truecolor-or-graphic-p) "#D8DEE9" "#D8DEE9"))
(nord-region-highlight-foreground (if (or
(string= nord-region-highlight "frost")
(string= nord-region-highlight "snowstorm")) "#2E3440" nil))
Expand Down Expand Up @@ -271,8 +275,17 @@
`(region ((,class (:foreground ,nord-region-highlight-foreground :background ,nord-region-highlight-background))))
`(scroll-bar ((,class (:background ,nord3))))
`(secondary-selection ((,class (:background ,nord2))))

;; `show-paren-match-face` and `show-paren-mismatch-face` are deprecated since Emacs version 22.1 and were
;; removed in Emacs 25.
;; https://github.com/arcticicestudio/nord-emacs/issues/75
;; http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=c430f7e23fc2c22f251ace4254e37dea1452dfc3
;; https://github.com/emacs-mirror/emacs/commit/c430f7e23fc2c22f251ace4254e37dea1452dfc3
`(show-paren-match-face ((,class (:foreground ,nord0 :background ,nord8))))
`(show-paren-mismatch-face ((,class (:background ,nord11))))

`(show-paren-match ((,class (:foreground ,nord0 :background ,nord8))))
`(show-paren-mismatch ((,class (:background ,nord11))))
`(success ((,class (:foreground ,nord14))))
`(term ((,class (:foreground ,nord4 :background ,nord0))))
`(term-color-black ((,class (:foreground ,nord1 :background ,nord1))))
Expand Down Expand Up @@ -626,15 +639,18 @@
`(neo-vc-up-to-date-face ((,class (:foreground ,nord4))))
`(neo-vc-user-face ((,class (:foreground ,nord4))))

;; > Cider
`(cider-result-overlay-face ((t (:background unspecified))))

;; > Org
`(org-level-1 ((,class (:foreground ,nord8 :weight bold))))
`(org-level-2 ((,class (:inherit org-level-1))))
`(org-level-3 ((,class (:inherit org-level-1))))
`(org-level-4 ((,class (:inherit org-level-1))))
`(org-level-5 ((,class (:inherit org-level-1))))
`(org-level-6 ((,class (:inherit org-level-1))))
`(org-level-7 ((,class (:inherit org-level-1))))
`(org-level-8 ((,class (:inherit org-level-1))))
`(org-level-1 ((,class (:foreground ,nord7 :weight extra-bold))))
`(org-level-2 ((,class (:foreground ,nord8 :weight bold))))
`(org-level-3 ((,class (:foreground ,nord9 :weight semi-bold))))
`(org-level-4 ((,class (:foreground ,nord10 :weight normal))))
`(org-level-5 ((,class (:inherit org-level-4))))
`(org-level-6 ((,class (:inherit org-level-4))))
`(org-level-7 ((,class (:inherit org-level-4))))
`(org-level-8 ((,class (:inherit org-level-4))))
`(org-agenda-structure ((,class (:foreground ,nord9))))
`(org-agenda-date ((,class (:foreground ,nord8 :underline nil))))
`(org-agenda-done ((,class (:foreground ,nord14))))
Expand Down Expand Up @@ -681,7 +697,15 @@
`(org-agenda-date-weekend ((,class (:foreground ,nord9))))
`(org-agenda-date-today ((,class (:foreground ,nord8 :weight bold))))
`(org-agenda-done ((,class (:foreground ,nord14))))
`(org-verbatim ((,class (:foreground ,nord7))))))
`(org-verbatim ((,class (:foreground ,nord7))))

;; > ivy-mode
`(ivy-current-match ((,class (:inherit region))))
`(ivy-minibuffer-match-face-1 ((,class (:inherit default))))
`(ivy-minibuffer-match-face-2 ((,class (:background ,nord7 :foreground ,nord0))))
`(ivy-minibuffer-match-face-3 ((,class (:background ,nord8 :foreground ,nord0))))
`(ivy-minibuffer-match-face-4 ((,class (:background ,nord9 :foreground ,nord0))))
`(ivy-remote ((,class (:foreground ,nord14))))))

;;;###autoload
(when (and (boundp 'custom-theme-load-path) load-file-name)
Expand Down

0 comments on commit 0f5295f

Please sign in to comment.