From d69a5dd7fdbafc2ac17cfa13a5ad3833fbc990ea Mon Sep 17 00:00:00 2001 From: Bradley Wright Date: Tue, 19 May 2015 21:01:47 +0100 Subject: [PATCH 01/11] Add Magit faces This covers all the use cases I commonly hit while using Magit. --- solarized-definitions.el | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/solarized-definitions.el b/solarized-definitions.el index de071d7..f92b6f7 100644 --- a/solarized-definitions.el +++ b/solarized-definitions.el @@ -750,7 +750,20 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further." ;; guide-key (guide-key/prefix-command-face (,@fg-blue)) (guide-key/highlight-command-face (,@fg-orange)) - (guide-key/key-face (,@fg-green))))))) + (guide-key/key-face (,@fg-green)) + ;; magit + (magit-log-sha1 (,@fg-red)) + (magit-branch (,@fg-yellow)) + (magit-tag (,@fg-green)) + (magit-diff-file-header (,@fg-blue)) + (magit-diff-hunk-header (:inherit default)) + (magit-log-author (,@fg-cyan)) + (magit-log-head-label-remote (,@fg-green)) + (magit-log-head-label-tags (,@fg-orange)) + (magit-log-head-label-local (,@fg-yellow)) + (magit-log-head-label-head (,@fg-violet)) + (magit-process-ok (,@fg-green :inherit magit-section-title)) + (magit-process-ng (,@fg-red :inherit magit-section-title))))))) ;;;###autoload (when (boundp 'custom-theme-load-path) From 2e4c3818811857727f0d958789ab6849e56f8d3b Mon Sep 17 00:00:00 2001 From: Bradley Wright Date: Wed, 20 May 2015 21:26:08 +0100 Subject: [PATCH 02/11] Inherit from diff-{hunk,file}-header instead This is what Magit actually does by default, so it's simpler to change the base faces than fontify the new ones exclusively. --- solarized-definitions.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/solarized-definitions.el b/solarized-definitions.el index f92b6f7..4fdbf5d 100644 --- a/solarized-definitions.el +++ b/solarized-definitions.el @@ -304,7 +304,8 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further." (diff-refine-change (,@fg-blue ,@bg-base02)))))) (diff-refine-added (:inherit diff-added ,@fmt-revr)) (diff-refine-removed (:inherit diff-removed ,@fmt-revr)) - (diff-file-header (,@bg-back)) + (diff-file-header (:inherit default ,@fg-blue)) + (diff-hunk-header (:inherit default)) (diff-header (,@fg-base1 ,@bg-back)) ;; IDO (ido-only-match (,@fg-green)) @@ -755,8 +756,6 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further." (magit-log-sha1 (,@fg-red)) (magit-branch (,@fg-yellow)) (magit-tag (,@fg-green)) - (magit-diff-file-header (,@fg-blue)) - (magit-diff-hunk-header (:inherit default)) (magit-log-author (,@fg-cyan)) (magit-log-head-label-remote (,@fg-green)) (magit-log-head-label-tags (,@fg-orange)) From a1b15aa9bdb8a3829f8662eb77fbfa5d0d1cd639 Mon Sep 17 00:00:00 2001 From: Bradley Wright Date: Thu, 21 May 2015 22:00:21 +0100 Subject: [PATCH 03/11] Fix company-mode selected tooltip The old one had such low contrast that it was invisible. This new scheme matches the scheme used by ido-mode, and is more readable. --- solarized-definitions.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solarized-definitions.el b/solarized-definitions.el index 4fdbf5d..97705c8 100644 --- a/solarized-definitions.el +++ b/solarized-definitions.el @@ -732,10 +732,10 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further." (term-color-white (,@fg-base00)) ;; company (company-tooltip (,@fg-base00 ,@bg-base02)) - (company-tooltip-selection (,@fg-base1 ,@bg-base02)) + (company-tooltip-selection (,@fg-green ,@bg-base02)) (company-tooltip-mouse (,@fg-base1 ,@bg-base02)) - (company-tooltip-common (,@fg-blue ,@bg-base02)) - (company-tooltip-common-selection (,@fg-blue ,@bg-base01)) + (company-tooltip-common (,@fg-blue ,@bg-base02 ,@fmt-undr)) + (company-tooltip-common-selection (,@fg-green ,@bg-base02 ,@fmt-undr)) (company-tooltip-annotation (,@fg-yellow ,@bg-base02)) (company-scrollbar-fg (,@bg-base0)) (company-scrollbar-bg (,@bg-base02)) From 6d23149222cd42a9979d1ab01ee737a413ba69ba Mon Sep 17 00:00:00 2001 From: Bradley Wright Date: Fri, 19 Jun 2015 23:19:50 +0100 Subject: [PATCH 04/11] Add faces for undo-tree --- solarized-definitions.el | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/solarized-definitions.el b/solarized-definitions.el index 97705c8..007e95b 100644 --- a/solarized-definitions.el +++ b/solarized-definitions.el @@ -762,7 +762,13 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further." (magit-log-head-label-local (,@fg-yellow)) (magit-log-head-label-head (,@fg-violet)) (magit-process-ok (,@fg-green :inherit magit-section-title)) - (magit-process-ng (,@fg-red :inherit magit-section-title))))))) + (magit-process-ng (,@fg-red :inherit magit-section-title)) + ;; undo-tree + (undo-tree-visualizer-current-face (,@fg-orange)) + (undo-tree-visualizer-default-face (:inherit shadow)) + (undo-tree-visualizer-active-branch-face (:inherit default)) + (undo-tree-visualizer-unmodified-face (,@fg-cyan)) + (undo-tree-visualizer-register-face (,@fg-yellow))))))) ;;;###autoload (when (boundp 'custom-theme-load-path) From e39a6a99d0f6732d507c4115454cb6af84df9a9e Mon Sep 17 00:00:00 2001 From: "Making GitHub Delicious." Date: Wed, 24 Jun 2015 23:50:43 -0600 Subject: [PATCH 05/11] add waffle.io badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index aef0126..cece3d4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![Stories in Ready](https://badge.waffle.io/sellout/emacs-color-theme-solarized.png?label=ready&title=Ready)](https://waffle.io/sellout/emacs-color-theme-solarized) Solarized Colorscheme for Emacs =============================== From 0ae54d07146c4f2329ac702341562b4a15fd9b7d Mon Sep 17 00:00:00 2001 From: deepak Date: Mon, 4 Jan 2016 10:13:37 -0500 Subject: [PATCH 06/11] nicer writegood-mode faces --- solarized-definitions.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/solarized-definitions.el b/solarized-definitions.el index 007e95b..e49f999 100644 --- a/solarized-definitions.el +++ b/solarized-definitions.el @@ -215,6 +215,8 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further." ;; FIXME: don’t hardcode the SRGB color names (fmt-curl-red `( :underline (:color "#dc322f" :style wave))) (fmt-curl-yellow `( :underline (:color "#b58900" :style wave))) + (fmt-curl-magenta `( :underline (:color "#d33682" :style wave))) + (fmt-curl-cyan `( :underline (:color "#2aa198" :style wave))) (fmt-ital `( :slant ,italic)) ;; FIXME: not quite the same (fmt-stnd `( :inverse-video t)) @@ -700,6 +702,10 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further." (whitespace-trailing (,@fmt-bold ,@fg-red ,@bg-base02)) (whitespace-highlight-face (,@fg-red ,@bg-blue)) (whitespace-line (,@fg-magenta)) + ;; writegood + (writegood-weasels-face (,@fmt-curl-cyan,@fg-cyan)) + (writegood-passive-voice-face (,@fg-magenta)) + (writegood-duplicates-face (:inherit error)) ;; rcirc (rcirc-my-nick (,@fg-blue)) (rcirc-nick-in-message (,@fg-orange)) From b93cc72ecb0e9e674634936167bf8c286f096c5e Mon Sep 17 00:00:00 2001 From: deepak Date: Thu, 7 Jan 2016 23:25:52 -0500 Subject: [PATCH 07/11] whitespace fixes --- solarized-definitions.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solarized-definitions.el b/solarized-definitions.el index e49f999..287999c 100644 --- a/solarized-definitions.el +++ b/solarized-definitions.el @@ -215,8 +215,8 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further." ;; FIXME: don’t hardcode the SRGB color names (fmt-curl-red `( :underline (:color "#dc322f" :style wave))) (fmt-curl-yellow `( :underline (:color "#b58900" :style wave))) - (fmt-curl-magenta `( :underline (:color "#d33682" :style wave))) - (fmt-curl-cyan `( :underline (:color "#2aa198" :style wave))) + (fmt-curl-magenta `( :underline (:color "#d33682" :style wave))) + (fmt-curl-cyan `( :underline (:color "#2aa198" :style wave))) (fmt-ital `( :slant ,italic)) ;; FIXME: not quite the same (fmt-stnd `( :inverse-video t)) @@ -703,7 +703,7 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further." (whitespace-highlight-face (,@fg-red ,@bg-blue)) (whitespace-line (,@fg-magenta)) ;; writegood - (writegood-weasels-face (,@fmt-curl-cyan,@fg-cyan)) + (writegood-weasels-face (,@fmt-curl-cyan ,@fg-cyan)) (writegood-passive-voice-face (,@fg-magenta)) (writegood-duplicates-face (:inherit error)) ;; rcirc From cd8e1e18dfd65ef75c57120db2017e6289735f51 Mon Sep 17 00:00:00 2001 From: Bradley Wright Date: Wed, 17 Feb 2016 22:50:21 +0000 Subject: [PATCH 08/11] Add bg versions for `term-color-N` faces Without these, reversed faces in `ansi-term` (eg black foreground on yellow background) or similar don't display properly - the background colour just inherits from default. --- solarized-definitions.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/solarized-definitions.el b/solarized-definitions.el index 287999c..66e317d 100644 --- a/solarized-definitions.el +++ b/solarized-definitions.el @@ -728,14 +728,14 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further." (rst-level-5 (:inherit outline-5)) (rst-level-6 (:inherit outline-6)) ;;ansi-term - (term-color-black (,@fg-base02)) - (term-color-red (,@fg-red)) - (term-color-green (,@fg-green)) - (term-color-yellow (,@fg-yellow)) - (term-color-blue (,@fg-blue)) - (term-color-magenta (,@fg-magenta)) - (term-color-cyan (,@fg-cyan)) - (term-color-white (,@fg-base00)) + (term-color-black (,@fg-base02 ,@bg-base02)) + (term-color-red (,@fg-red ,@bg-red)) + (term-color-green (,@fg-green ,@bg-green)) + (term-color-yellow (,@fg-yellow ,@bg-yellow)) + (term-color-blue (,@fg-blue ,@bg-blue)) + (term-color-magenta (,@fg-magenta ,@bg-magenta)) + (term-color-cyan (,@fg-cyan ,@bg-cyan)) + (term-color-white (,@fg-base00 ,@bg-base00)) ;; company (company-tooltip (,@fg-base00 ,@bg-base02)) (company-tooltip-selection (,@fg-green ,@bg-base02)) From 80e9606d75f0f594cdb93c74788e0d92c3adbe8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arthur=20Fayzrakhmanov=20=28=D0=90=D1=80=D1=82=D1=83=D1=80?= =?UTF-8?q?=20=D0=A4=D0=B0=D0=B9=D0=B7=D1=80=D0=B0=D1=85=D0=BC=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=29?= Date: Fri, 19 Feb 2016 17:42:29 +0500 Subject: [PATCH 09/11] Add haskell keyword customization Make keyword colors match to Vim's version for Haskell source files --- solarized-definitions.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/solarized-definitions.el b/solarized-definitions.el index 287999c..b3cb45f 100644 --- a/solarized-definitions.el +++ b/solarized-definitions.el @@ -774,7 +774,9 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further." (undo-tree-visualizer-default-face (:inherit shadow)) (undo-tree-visualizer-active-branch-face (:inherit default)) (undo-tree-visualizer-unmodified-face (,@fg-cyan)) - (undo-tree-visualizer-register-face (,@fg-yellow))))))) + (undo-tree-visualizer-register-face (,@fg-yellow)) + ;; haskell + (haskell-keyword-face (,@fg-cyan))))))) ;;;###autoload (when (boundp 'custom-theme-load-path) From 1c5a55acf4a8e2cf41a4cb97243bfcd009b91823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arthur=20Fayzrakhmanov=20=28=D0=90=D1=80=D1=82=D1=83=D1=80?= =?UTF-8?q?=20=D0=A4=D0=B0=D0=B9=D0=B7=D1=80=D0=B0=D1=85=D0=BC=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=29?= Date: Fri, 19 Feb 2016 15:06:38 +0500 Subject: [PATCH 10/11] Fix whitespace-newline face --- solarized-definitions.el | 1 + 1 file changed, 1 insertion(+) diff --git a/solarized-definitions.el b/solarized-definitions.el index b3cb45f..6b69b8e 100644 --- a/solarized-definitions.el +++ b/solarized-definitions.el @@ -702,6 +702,7 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further." (whitespace-trailing (,@fmt-bold ,@fg-red ,@bg-base02)) (whitespace-highlight-face (,@fg-red ,@bg-blue)) (whitespace-line (,@fg-magenta)) + (whitespace-newline (:inherit shadow :slant normal)) ;; writegood (writegood-weasels-face (,@fmt-curl-cyan ,@fg-cyan)) (writegood-passive-voice-face (,@fg-magenta)) From c44d42eff7a2ee61b1b7191f4ba467612b7c6a13 Mon Sep 17 00:00:00 2001 From: Lee Hinman Date: Sun, 21 Feb 2016 16:14:55 -0700 Subject: [PATCH 11/11] Only add solarized to color-themes list if color-themes is bound --- color-theme-solarized.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/color-theme-solarized.el b/color-theme-solarized.el index 298ae94..16aaa3e 100644 --- a/color-theme-solarized.el +++ b/color-theme-solarized.el @@ -30,10 +30,11 @@ Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized." (color-theme-install `(color-theme-solarized () () ,@(solarized-color-definitions)))) -(add-to-list 'color-themes - `(color-theme-solarized - "Solarized" - ,solarized-description)) +(when (boundp 'color-themes) + (add-to-list 'color-themes + `(color-theme-solarized + "Solarized" + ,solarized-description))) ;;;###autoload (defun color-theme-solarized-dark ()