[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/spacemacs-theme 282bf317ab 150/336: use better colors for
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/spacemacs-theme 282bf317ab 150/336: use better colors for true-color terminals |
Date: |
Fri, 14 Jan 2022 10:59:28 -0500 (EST) |
branch: elpa/spacemacs-theme
commit 282bf317abca7a3bdf5099e2b170919e17af4db0
Author: Charles Strahan <charles.c.strahan@gmail.com>
Commit: Charles Strahan <charles.c.strahan@gmail.com>
use better colors for true-color terminals
---
spacemacs-common.el | 115 +++++++++++++++++++++++++++-------------------------
1 file changed, 60 insertions(+), 55 deletions(-)
diff --git a/spacemacs-common.el b/spacemacs-common.el
index b943e16ad0..f7f1b8cf19 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -61,6 +61,11 @@
:type 'alist
:group 'spacemacs-theme)
+(defun true-color-p ()
+ (or
+ (display-graphic-p)
+ (= (tty-display-color-cells) 16777216)))
+
(defun custom-colors-override ()
(mapcar (lambda (x) (list (car x) (cdr x)))
spacemacs-theme-custom-colors))
@@ -69,63 +74,63 @@
(dyn-let ((class '((class color) (min-colors 89))) ;; ~~
Dark ~~ ~~ Light ~~
;; GUI
TER GUI TER
;; generic
- (act1 (if (eq variant 'dark) (if (display-graphic-p)
"#222226" "#121212") (if (display-graphic-p) "#e7e5eb" "#d7dfff")))
- (act2 (if (eq variant 'dark) (if (display-graphic-p)
"#5d4d7a" "#444444") (if (display-graphic-p) "#d3d3e7" "#afafd7")))
- (base (if (eq variant 'dark) (if (display-graphic-p)
"#b2b2b2" "#b2b2b2") (if (display-graphic-p) "#655370" "#5f5f87")))
- (base-dim (if (eq variant 'dark) (if (display-graphic-p)
"#545557" "#585858") (if (display-graphic-p) "#cdc5c8" "#afafd7")))
- (bg1 (if (eq variant 'dark) (if (display-graphic-p)
"#292b2e" "#262626") (if (display-graphic-p) "#fbf8ef" "#ffffff")))
- (bg2 (if (eq variant 'dark) (if (display-graphic-p)
"#212026" "#1c1c1c") (if (display-graphic-p) "#efeae9" "#e4e4e4")))
- (bg3 (if (eq variant 'dark) (if (display-graphic-p)
"#100a14" "#121212") (if (display-graphic-p) "#e3dedd" "#d0d0d0")))
- (bg4 (if (eq variant 'dark) (if (display-graphic-p)
"#0a0814" "#080808") (if (display-graphic-p) "#d2ceda" "#bcbcbc")))
- (border (if (eq variant 'dark) (if (display-graphic-p)
"#5d4d7a" "#111111") (if (display-graphic-p) "#b3b9be" "#b3b9be")))
- (cblk (if (eq variant 'dark) (if (display-graphic-p)
"#cbc1d5" "#b2b2b2") (if (display-graphic-p) "#655370" "#5f5f87")))
- (cblk-bg (if (eq variant 'dark) (if (display-graphic-p)
"#2f2b33" "#262626") (if (display-graphic-p) "#e8e3f0" "#ffffff")))
- (cblk-ln (if (eq variant 'dark) (if (display-graphic-p)
"#827591" "#af5faf") (if (display-graphic-p) "#9380b2" "#af5fdf")))
- (cblk-ln-bg (if (eq variant 'dark) (if (display-graphic-p)
"#373040" "#333333") (if (display-graphic-p) "#ddd8eb" "#dfdfff")))
- (cursor (if (eq variant 'dark) (if (display-graphic-p)
"#e3dedd" "#d0d0d0") (if (display-graphic-p) "#100a14" "#121212")))
- (const (if (eq variant 'dark) (if (display-graphic-p)
"#a45bad" "#d75fd7") (if (display-graphic-p) "#4e3163" "#8700af")))
- (comment (if (eq variant 'dark) (if (display-graphic-p)
"#2aa1ae" "#008787") (if (display-graphic-p) "#2aa1ae" "#008787")))
- (comment-bg (if (eq variant 'dark) (if (display-graphic-p)
"#292e34" "#262626") (if (display-graphic-p) "#ecf3ec" "#ffffff")))
- (comp (if (eq variant 'dark) (if (display-graphic-p)
"#c56ec3" "#d75fd7") (if (display-graphic-p) "#6c4173" "#8700af")))
- (err (if (eq variant 'dark) (if (display-graphic-p)
"#e0211d" "#e0211d") (if (display-graphic-p) "#e0211d" "#e0211d")))
- (func (if (eq variant 'dark) (if (display-graphic-p)
"#bc6ec5" "#d75fd7") (if (display-graphic-p) "#6c3163" "#8700af")))
- (head1 (if (eq variant 'dark) (if (display-graphic-p)
"#4f97d7" "#268bd2") (if (display-graphic-p) "#3a81c3" "#268bd2")))
- (head1-bg (if (eq variant 'dark) (if (display-graphic-p)
"#293239" "#262626") (if (display-graphic-p) "#edf1ed" "#ffffff")))
- (head2 (if (eq variant 'dark) (if (display-graphic-p)
"#2d9574" "#2aa198") (if (display-graphic-p) "#2d9574" "#2aa198")))
- (head2-bg (if (eq variant 'dark) (if (display-graphic-p)
"#293235" "#262626") (if (display-graphic-p) "#edf2e9" "#ffffff")))
- (head3 (if (eq variant 'dark) (if (display-graphic-p)
"#67b11d" "#67b11d") (if (display-graphic-p) "#67b11d" "#5faf00")))
- (head3-bg (if (eq variant 'dark) (if (display-graphic-p)
"#293235" "#262626") (if (display-graphic-p) "#edf2e9" "#ffffff")))
- (head4 (if (eq variant 'dark) (if (display-graphic-p)
"#b1951d" "#875f00") (if (display-graphic-p) "#b1951d" "#875f00")))
- (head4-bg (if (eq variant 'dark) (if (display-graphic-p)
"#32322c" "#262626") (if (display-graphic-p) "#f6f1e1" "#ffffff")))
- (highlight (if (eq variant 'dark) (if (display-graphic-p)
"#444155" "#444444") (if (display-graphic-p) "#d3d3e7" "#d7d7ff")))
- (keyword (if (eq variant 'dark) (if (display-graphic-p)
"#4f97d7" "#268bd2") (if (display-graphic-p) "#3a81c3" "#268bd2")))
- (lnum (if (eq variant 'dark) (if (display-graphic-p)
"#44505c" "#444444") (if (display-graphic-p) "#a8a8bf" "#af87af")))
- (mat (if (eq variant 'dark) (if (display-graphic-p)
"#86dc2f" "#86dc2f") (if (display-graphic-p) "#ba2f59" "#af005f")))
- (meta (if (eq variant 'dark) (if (display-graphic-p)
"#9f8766" "#af875f") (if (display-graphic-p) "#da8b55" "#df5f5f")))
- (str (if (eq variant 'dark) (if (display-graphic-p)
"#2d9574" "#2aa198") (if (display-graphic-p) "#2d9574" "#2aa198")))
- (suc (if (eq variant 'dark) (if (display-graphic-p)
"#86dc2f" "#86dc2f") (if (display-graphic-p) "#42ae2c" "#00af00")))
- (ttip (if (eq variant 'dark) (if (display-graphic-p)
"#9a9aba" "#888888") (if (display-graphic-p) "#8c799f" "#5f5f87")))
- (ttip-sl (if (eq variant 'dark) (if (display-graphic-p)
"#5e5079" "#333333") (if (display-graphic-p) "#c8c6dd" "#afafff")))
- (ttip-bg (if (eq variant 'dark) (if (display-graphic-p)
"#34323e" "#444444") (if (display-graphic-p) "#e2e0ea" "#dfdfff")))
- (type (if (eq variant 'dark) (if (display-graphic-p)
"#ce537a" "#df005f") (if (display-graphic-p) "#ba2f59" "#af005f")))
- (var (if (eq variant 'dark) (if (display-graphic-p)
"#7590db" "#8787d7") (if (display-graphic-p) "#715ab1" "#af5fd7")))
- (war (if (eq variant 'dark) (if (display-graphic-p)
"#dc752f" "#dc752f") (if (display-graphic-p) "#dc752f" "#dc752f")))
+ (act1 (if (eq variant 'dark) (if (true-color-p) "#222226"
"#121212") (if (true-color-p) "#e7e5eb" "#d7dfff")))
+ (act2 (if (eq variant 'dark) (if (true-color-p) "#5d4d7a"
"#444444") (if (true-color-p) "#d3d3e7" "#afafd7")))
+ (base (if (eq variant 'dark) (if (true-color-p) "#b2b2b2"
"#b2b2b2") (if (true-color-p) "#655370" "#5f5f87")))
+ (base-dim (if (eq variant 'dark) (if (true-color-p) "#545557"
"#585858") (if (true-color-p) "#cdc5c8" "#afafd7")))
+ (bg1 (if (eq variant 'dark) (if (true-color-p) "#292b2e"
"#262626") (if (true-color-p) "#fbf8ef" "#ffffff")))
+ (bg2 (if (eq variant 'dark) (if (true-color-p) "#212026"
"#1c1c1c") (if (true-color-p) "#efeae9" "#e4e4e4")))
+ (bg3 (if (eq variant 'dark) (if (true-color-p) "#100a14"
"#121212") (if (true-color-p) "#e3dedd" "#d0d0d0")))
+ (bg4 (if (eq variant 'dark) (if (true-color-p) "#0a0814"
"#080808") (if (true-color-p) "#d2ceda" "#bcbcbc")))
+ (border (if (eq variant 'dark) (if (true-color-p) "#5d4d7a"
"#111111") (if (true-color-p) "#b3b9be" "#b3b9be")))
+ (cblk (if (eq variant 'dark) (if (true-color-p) "#cbc1d5"
"#b2b2b2") (if (true-color-p) "#655370" "#5f5f87")))
+ (cblk-bg (if (eq variant 'dark) (if (true-color-p) "#2f2b33"
"#262626") (if (true-color-p) "#e8e3f0" "#ffffff")))
+ (cblk-ln (if (eq variant 'dark) (if (true-color-p) "#827591"
"#af5faf") (if (true-color-p) "#9380b2" "#af5fdf")))
+ (cblk-ln-bg (if (eq variant 'dark) (if (true-color-p) "#373040"
"#333333") (if (true-color-p) "#ddd8eb" "#dfdfff")))
+ (cursor (if (eq variant 'dark) (if (true-color-p) "#e3dedd"
"#d0d0d0") (if (true-color-p) "#100a14" "#121212")))
+ (const (if (eq variant 'dark) (if (true-color-p) "#a45bad"
"#d75fd7") (if (true-color-p) "#4e3163" "#8700af")))
+ (comment (if (eq variant 'dark) (if (true-color-p) "#2aa1ae"
"#008787") (if (true-color-p) "#2aa1ae" "#008787")))
+ (comment-bg (if (eq variant 'dark) (if (true-color-p) "#292e34"
"#262626") (if (true-color-p) "#ecf3ec" "#ffffff")))
+ (comp (if (eq variant 'dark) (if (true-color-p) "#c56ec3"
"#d75fd7") (if (true-color-p) "#6c4173" "#8700af")))
+ (err (if (eq variant 'dark) (if (true-color-p) "#e0211d"
"#e0211d") (if (true-color-p) "#e0211d" "#e0211d")))
+ (func (if (eq variant 'dark) (if (true-color-p) "#bc6ec5"
"#d75fd7") (if (true-color-p) "#6c3163" "#8700af")))
+ (head1 (if (eq variant 'dark) (if (true-color-p) "#4f97d7"
"#268bd2") (if (true-color-p) "#3a81c3" "#268bd2")))
+ (head1-bg (if (eq variant 'dark) (if (true-color-p) "#293239"
"#262626") (if (true-color-p) "#edf1ed" "#ffffff")))
+ (head2 (if (eq variant 'dark) (if (true-color-p) "#2d9574"
"#2aa198") (if (true-color-p) "#2d9574" "#2aa198")))
+ (head2-bg (if (eq variant 'dark) (if (true-color-p) "#293235"
"#262626") (if (true-color-p) "#edf2e9" "#ffffff")))
+ (head3 (if (eq variant 'dark) (if (true-color-p) "#67b11d"
"#67b11d") (if (true-color-p) "#67b11d" "#5faf00")))
+ (head3-bg (if (eq variant 'dark) (if (true-color-p) "#293235"
"#262626") (if (true-color-p) "#edf2e9" "#ffffff")))
+ (head4 (if (eq variant 'dark) (if (true-color-p) "#b1951d"
"#875f00") (if (true-color-p) "#b1951d" "#875f00")))
+ (head4-bg (if (eq variant 'dark) (if (true-color-p) "#32322c"
"#262626") (if (true-color-p) "#f6f1e1" "#ffffff")))
+ (highlight (if (eq variant 'dark) (if (true-color-p) "#444155"
"#444444") (if (true-color-p) "#d3d3e7" "#d7d7ff")))
+ (keyword (if (eq variant 'dark) (if (true-color-p) "#4f97d7"
"#268bd2") (if (true-color-p) "#3a81c3" "#268bd2")))
+ (lnum (if (eq variant 'dark) (if (true-color-p) "#44505c"
"#444444") (if (true-color-p) "#a8a8bf" "#af87af")))
+ (mat (if (eq variant 'dark) (if (true-color-p) "#86dc2f"
"#86dc2f") (if (true-color-p) "#ba2f59" "#af005f")))
+ (meta (if (eq variant 'dark) (if (true-color-p) "#9f8766"
"#af875f") (if (true-color-p) "#da8b55" "#df5f5f")))
+ (str (if (eq variant 'dark) (if (true-color-p) "#2d9574"
"#2aa198") (if (true-color-p) "#2d9574" "#2aa198")))
+ (suc (if (eq variant 'dark) (if (true-color-p) "#86dc2f"
"#86dc2f") (if (true-color-p) "#42ae2c" "#00af00")))
+ (ttip (if (eq variant 'dark) (if (true-color-p) "#9a9aba"
"#888888") (if (true-color-p) "#8c799f" "#5f5f87")))
+ (ttip-sl (if (eq variant 'dark) (if (true-color-p) "#5e5079"
"#333333") (if (true-color-p) "#c8c6dd" "#afafff")))
+ (ttip-bg (if (eq variant 'dark) (if (true-color-p) "#34323e"
"#444444") (if (true-color-p) "#e2e0ea" "#dfdfff")))
+ (type (if (eq variant 'dark) (if (true-color-p) "#ce537a"
"#df005f") (if (true-color-p) "#ba2f59" "#af005f")))
+ (var (if (eq variant 'dark) (if (true-color-p) "#7590db"
"#8787d7") (if (true-color-p) "#715ab1" "#af5fd7")))
+ (war (if (eq variant 'dark) (if (true-color-p) "#dc752f"
"#dc752f") (if (true-color-p) "#dc752f" "#dc752f")))
;; colors
- (aqua (if (eq variant 'dark) (if (display-graphic-p)
"#2d9574" "#2aa198") (if (display-graphic-p) "#2d9574" "#2aa198")))
- (aqua-bg (if (eq variant 'dark) (if (display-graphic-p)
"#293235" "#262626") (if (display-graphic-p) "#edf2e9" "#ffffff")))
- (green (if (eq variant 'dark) (if (display-graphic-p)
"#67b11d" "#67b11d") (if (display-graphic-p) "#67b11d" "#5faf00")))
- (green-bg (if (eq variant 'dark) (if (display-graphic-p)
"#293235" "#262626") (if (display-graphic-p) "#edf2e9" "#ffffff")))
- (green-bg-s (if (eq variant 'dark) (if (display-graphic-p)
"#29422d" "#262626") (if (display-graphic-p) "#dae6d0" "#ffffff")))
- (cyan (if (eq variant 'dark) (if (display-graphic-p)
"#28def0" "#00ffff") (if (display-graphic-p) "#21b8c7" "#008080")))
- (red (if (eq variant 'dark) (if (display-graphic-p)
"#f2241f" "#d70000") (if (display-graphic-p) "#f2241f" "#d70008")))
- (red-bg (if (eq variant 'dark) (if (display-graphic-p)
"#3c2a2c" "#262626") (if (display-graphic-p) "#faede4" "#ffffff")))
- (red-bg-s (if (eq variant 'dark) (if (display-graphic-p)
"#512e31" "#262626") (if (display-graphic-p) "#eed9d2" "#ffffff")))
- (blue (if (eq variant 'dark) (if (display-graphic-p)
"#4f97d7" "#268bd2") (if (display-graphic-p) "#3a81c3" "#268bd2")))
- (blue-bg (if (eq variant 'dark) (if (display-graphic-p)
"#293239" "#262626") (if (display-graphic-p) "#edf1ed" "#ffffff")))
- (violet (if (eq variant 'dark) (if (display-graphic-p)
"#a31db1" "#af00df") (if (display-graphic-p) "#a31db1" "#800080")))
- (yellow (if (eq variant 'dark) (if (display-graphic-p)
"#b1951d" "#875f00") (if (display-graphic-p) "#b1951d" "#875f00")))
- (yellow-bg (if (eq variant 'dark) (if (display-graphic-p)
"#32322c" "#262626") (if (display-graphic-p) "#f6f1e1" "#ffffff")))
+ (aqua (if (eq variant 'dark) (if (true-color-p) "#2d9574"
"#2aa198") (if (true-color-p) "#2d9574" "#2aa198")))
+ (aqua-bg (if (eq variant 'dark) (if (true-color-p) "#293235"
"#262626") (if (true-color-p) "#edf2e9" "#ffffff")))
+ (green (if (eq variant 'dark) (if (true-color-p) "#67b11d"
"#67b11d") (if (true-color-p) "#67b11d" "#5faf00")))
+ (green-bg (if (eq variant 'dark) (if (true-color-p) "#293235"
"#262626") (if (true-color-p) "#edf2e9" "#ffffff")))
+ (green-bg-s (if (eq variant 'dark) (if (true-color-p) "#29422d"
"#262626") (if (true-color-p) "#dae6d0" "#ffffff")))
+ (cyan (if (eq variant 'dark) (if (true-color-p) "#28def0"
"#00ffff") (if (true-color-p) "#21b8c7" "#008080")))
+ (red (if (eq variant 'dark) (if (true-color-p) "#f2241f"
"#d70000") (if (true-color-p) "#f2241f" "#d70008")))
+ (red-bg (if (eq variant 'dark) (if (true-color-p) "#3c2a2c"
"#262626") (if (true-color-p) "#faede4" "#ffffff")))
+ (red-bg-s (if (eq variant 'dark) (if (true-color-p) "#512e31"
"#262626") (if (true-color-p) "#eed9d2" "#ffffff")))
+ (blue (if (eq variant 'dark) (if (true-color-p) "#4f97d7"
"#268bd2") (if (true-color-p) "#3a81c3" "#268bd2")))
+ (blue-bg (if (eq variant 'dark) (if (true-color-p) "#293239"
"#262626") (if (true-color-p) "#edf1ed" "#ffffff")))
+ (violet (if (eq variant 'dark) (if (true-color-p) "#a31db1"
"#af00df") (if (true-color-p) "#a31db1" "#800080")))
+ (yellow (if (eq variant 'dark) (if (true-color-p) "#b1951d"
"#875f00") (if (true-color-p) "#b1951d" "#875f00")))
+ (yellow-bg (if (eq variant 'dark) (if (true-color-p) "#32322c"
"#262626") (if (true-color-p) "#f6f1e1" "#ffffff")))
)
custom-colors-override
- [nongnu] elpa/spacemacs-theme 294bf47e29 073/336: polish - mode-line same height active / inactive, (continued)
- [nongnu] elpa/spacemacs-theme 294bf47e29 073/336: polish - mode-line same height active / inactive, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 8aa747a15b 078/336: Fix #12, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 8a023785f4 087/336: Support diff-hl, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme d22b0c42bb 092/336: Revamp of company tooltips, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme d9c256ab7c 089/336: linum-relative support, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme e5f95e427e 105/336: Merge pull request #24 from xuchunyang/support-which-function-mode, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 20753b88d8 112/336: Make org-agenda respect spacemacs-theme-org-height, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 2f16b73cb8 111/336: Merge pull request #28 from nixmaniack/enh_mode_face_enhancement, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme b608285378 116/336: Make org schedules and tasks more readable, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 2fc6a892a7 095/336: Org buttons and regular buttons support, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 282bf317ab 150/336: use better colors for true-color terminals,
ELPA Syncer <=
- [nongnu] elpa/spacemacs-theme 3e87a0fde9 151/336: Merge pull request #39 from cstrahan/true-color, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 8b07af28f6 153/336: Support cider, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 6b93fb3504 138/336: Unifying search utilities look, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 5c8bb4b403 175/336: Unify org, markdown, latex headings (fix #58), ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 069cb4c14e 184/336: Little formatting for the last PR, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 3e8f0d8fab 174/336: Fix (#56) colors for helm-ag, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 4342800a4a 188/336: Merge pull request #69 from atheriel/elfeed-date-face, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 6d96877d22 177/336: Support Jabber (Fix #59), ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 6c74d12a03 179/336: Fix (#62) add custom var org agenda height, ELPA Syncer, 2022/01/14
- [nongnu] elpa/spacemacs-theme 30068e248b 181/336: Initial support for elfeed, ELPA Syncer, 2022/01/14