emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/spacemacs-theme 35494e97d9 064/336: More org markup suppor


From: ELPA Syncer
Subject: [nongnu] elpa/spacemacs-theme 35494e97d9 064/336: More org markup support, thanks @mistnim!
Date: Fri, 14 Jan 2022 10:59:00 -0500 (EST)

branch: elpa/spacemacs-theme
commit 35494e97d92025450a04d73c99348bebe5e6d9f4
Author: nashamri <designernasser@gmail.com>
Commit: nashamri <designernasser@gmail.com>

    More org markup support, thanks @mistnim!
---
 spacemacs-common.el | 76 +++++++++++++++++++++++++++--------------------------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/spacemacs-common.el b/spacemacs-common.el
index 9d4ddd1573..d6e4ce5034 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -50,41 +50,42 @@
 
 (defun create-spacemacs-theme (variant theme-name)
   (let ((class '((class color) (min-colors 89))) ;;                    ~~ Dark 
~~                                   ~~ Light ~~
-        ;;                                                            GUI      
 TER                                GUI       TER
-        (base       (if (eq variant 'dark) (if (display-graphic-p) "#b2b2b2" 
"#b2b2b2") (if (display-graphic-p) "#655370" "#5f5f87")))
-        (cursor     (if (eq variant 'dark) (if (display-graphic-p) "#e3dedd" 
"#d0d0d0") (if (display-graphic-p) "#100a14" "#121212")))
-        (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")))
-        (key1       (if (eq variant 'dark) (if (display-graphic-p) "#4f97d7" 
"#4f97d7") (if (display-graphic-p) "#4f97d7" "#4f97d7")))
-        (key2       (if (eq variant 'dark) (if (display-graphic-p) "#277bb8" 
"#277bb8") (if (display-graphic-p) "#277bb8" "#277bb8")))
-        (builtin    (if (eq variant 'dark) (if (display-graphic-p) "#1f71ab" 
"#268bd2") (if (display-graphic-p) "#1f71ab" "#268bd2")))
-        (keyword    (if (eq variant 'dark) (if (display-graphic-p) "#237fbf" 
"#268bd2") (if (display-graphic-p) "#237fbf" "#268bd2")))
-        (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) "#2aa198" 
"#2aa198") (if (display-graphic-p) "#2aa198" "#2aa198")))
-        (comment-bg (if (eq variant 'dark) (if (display-graphic-p) "#293234" 
"#262626") (if (display-graphic-p) "#eff3ea" "#ffffff")))
-        (func       (if (eq variant 'dark) (if (display-graphic-p) "#bc6ec5" 
"#d75fd7") (if (display-graphic-p) "#6c3163" "#8700af")))
-        (str        (if (eq variant 'dark) (if (display-graphic-p) "#2aa198" 
"#2aa198") (if (display-graphic-p) "#2aa198" "#2aa198")))
-        (type       (if (eq variant 'dark) (if (display-graphic-p) "#c56ec3" 
"#d75fd7") (if (display-graphic-p) "#6c4173" "#8700af")))
-        (var        (if (eq variant 'dark) (if (display-graphic-p) "#adaab3" 
"#adaab3") (if (display-graphic-p) "#656370" "#767676")))
-        (err        (if (eq variant 'dark) (if (display-graphic-p) "#e0211d" 
"#e0211d") (if (display-graphic-p) "#e0211d" "#e0211d")))
-        (war        (if (eq variant 'dark) (if (display-graphic-p) "#dc752f" 
"#dc752f") (if (display-graphic-p) "#dc752f" "#dc752f")))
-        (inf        (if (eq variant 'dark) (if (display-graphic-p) "#2f96dc" 
"#2f96dc") (if (display-graphic-p) "#2f96dc" "#2f96dc")))
-        (suc        (if (eq variant 'dark) (if (display-graphic-p) "#86dc2f" 
"#86dc2f") (if (display-graphic-p) "#86dc2f" "#87ff00")))
-        (green      (if (eq variant 'dark) (if (display-graphic-p) "#67b11d" 
"#67b11d") (if (display-graphic-p) "#67b11d" "#5faf00")))
-        (yellow     (if (eq variant 'dark) (if (display-graphic-p) "#b1951d" 
"#875f00") (if (display-graphic-p) "#b1951d" "#875f00")))
-        (cyan       (if (eq variant 'dark) (if (display-graphic-p) "#28def0" 
"#00ffff") (if (display-graphic-p) "#21b8c7" "#008080")))
-        (violet     (if (eq variant 'dark) (if (display-graphic-p) "#a31db1" 
"#af00df") (if (display-graphic-p) "#a31db1" "#800080")))
-        (red        (if (eq variant 'dark) (if (display-graphic-p) "#f2241f" 
"#d70000") (if (display-graphic-p) "#f2241f" "#d70008")))
-        (active1    (if (eq variant 'dark) (if (display-graphic-p) "#222226" 
"#121212") (if (display-graphic-p) "#e7e5eb" "#d7dfff")))
-        (active2    (if (eq variant 'dark) (if (display-graphic-p) "#5d4d7a" 
"#444444") (if (display-graphic-p) "#d3d3e7" "#afafd7")))
-        (inactive   (if (eq variant 'dark) (if (display-graphic-p) "#5d4d7a" 
"#111111") (if (display-graphic-p) "#9f8fbd" "#af87d7")))
-        (org-h1-bg  (if (eq variant 'dark) (if (display-graphic-p) "#293239" 
"#262626") (if (display-graphic-p) "#edf1ed" "#ffffff")))
-        (org-h2-bg  (if (eq variant 'dark) (if (display-graphic-p) "#293235" 
"#262626") (if (display-graphic-p) "#edf2e9" "#ffffff")))
-        (org-h3-bg  (if (eq variant 'dark) (if (display-graphic-p) "#2d332c" 
"#262626") (if (display-graphic-p) "#f1f3e1" "#ffffff")))
-        (org-h4-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) "#333c45" 
"#444444") (if (display-graphic-p) "#d3d3e7" "#d7d7ff"))))
+        ;;                                                               GUI   
    TER                                GUI       TER
+        (base          (if (eq variant 'dark) (if (display-graphic-p) 
"#b2b2b2" "#b2b2b2") (if (display-graphic-p) "#655370" "#5f5f87")))
+        (cursor        (if (eq variant 'dark) (if (display-graphic-p) 
"#e3dedd" "#d0d0d0") (if (display-graphic-p) "#100a14" "#121212")))
+        (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")))
+        (key1          (if (eq variant 'dark) (if (display-graphic-p) 
"#4f97d7" "#4f97d7") (if (display-graphic-p) "#4f97d7" "#4f97d7")))
+        (key2          (if (eq variant 'dark) (if (display-graphic-p) 
"#277bb8" "#277bb8") (if (display-graphic-p) "#277bb8" "#277bb8")))
+        (builtin       (if (eq variant 'dark) (if (display-graphic-p) 
"#1f71ab" "#268bd2") (if (display-graphic-p) "#1f71ab" "#268bd2")))
+        (keyword       (if (eq variant 'dark) (if (display-graphic-p) 
"#237fbf" "#268bd2") (if (display-graphic-p) "#237fbf" "#268bd2")))
+        (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) 
"#2aa198" "#2aa198") (if (display-graphic-p) "#2aa198" "#2aa198")))
+        (comment-bg    (if (eq variant 'dark) (if (display-graphic-p) 
"#293234" "#262626") (if (display-graphic-p) "#eff3ea" "#ffffff")))
+        (func          (if (eq variant 'dark) (if (display-graphic-p) 
"#bc6ec5" "#d75fd7") (if (display-graphic-p) "#6c3163" "#8700af")))
+        (str           (if (eq variant 'dark) (if (display-graphic-p) 
"#2aa198" "#2aa198") (if (display-graphic-p) "#2aa198" "#2aa198")))
+        (type          (if (eq variant 'dark) (if (display-graphic-p) 
"#c56ec3" "#d75fd7") (if (display-graphic-p) "#6c4173" "#8700af")))
+        (var           (if (eq variant 'dark) (if (display-graphic-p) 
"#adaab3" "#adaab3") (if (display-graphic-p) "#656370" "#767676")))
+        (err           (if (eq variant 'dark) (if (display-graphic-p) 
"#e0211d" "#e0211d") (if (display-graphic-p) "#e0211d" "#e0211d")))
+        (war           (if (eq variant 'dark) (if (display-graphic-p) 
"#dc752f" "#dc752f") (if (display-graphic-p) "#dc752f" "#dc752f")))
+        (inf           (if (eq variant 'dark) (if (display-graphic-p) 
"#2f96dc" "#2f96dc") (if (display-graphic-p) "#2f96dc" "#2f96dc")))
+        (suc           (if (eq variant 'dark) (if (display-graphic-p) 
"#86dc2f" "#86dc2f") (if (display-graphic-p) "#86dc2f" "#87ff00")))
+        (green         (if (eq variant 'dark) (if (display-graphic-p) 
"#67b11d" "#67b11d") (if (display-graphic-p) "#67b11d" "#5faf00")))
+        (yellow        (if (eq variant 'dark) (if (display-graphic-p) 
"#b1951d" "#875f00") (if (display-graphic-p) "#b1951d" "#875f00")))
+        (cyan          (if (eq variant 'dark) (if (display-graphic-p) 
"#28def0" "#00ffff") (if (display-graphic-p) "#21b8c7" "#008080")))
+        (violet        (if (eq variant 'dark) (if (display-graphic-p) 
"#a31db1" "#af00df") (if (display-graphic-p) "#a31db1" "#800080")))
+        (red           (if (eq variant 'dark) (if (display-graphic-p) 
"#f2241f" "#d70000") (if (display-graphic-p) "#f2241f" "#d70008")))
+        (active1       (if (eq variant 'dark) (if (display-graphic-p) 
"#222226" "#121212") (if (display-graphic-p) "#e7e5eb" "#d7dfff")))
+        (active2       (if (eq variant 'dark) (if (display-graphic-p) 
"#5d4d7a" "#444444") (if (display-graphic-p) "#d3d3e7" "#afafd7")))
+        (inactive      (if (eq variant 'dark) (if (display-graphic-p) 
"#5d4d7a" "#111111") (if (display-graphic-p) "#9f8fbd" "#af87d7")))
+        (org-block-bg  (if (eq variant 'dark) (if (display-graphic-p) 
"#232528" "#262626") (if (display-graphic-p) "#d9e6dd" "#ffffff")))
+        (org-h1-bg     (if (eq variant 'dark) (if (display-graphic-p) 
"#293239" "#121212") (if (display-graphic-p) "#edf1ed" "#ffffff")))
+        (org-h2-bg     (if (eq variant 'dark) (if (display-graphic-p) 
"#293235" "#262626") (if (display-graphic-p) "#edf2e9" "#ffffff")))
+        (org-h3-bg     (if (eq variant 'dark) (if (display-graphic-p) 
"#2d332c" "#262626") (if (display-graphic-p) "#f1f3e1" "#ffffff")))
+        (org-h4-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) 
"#333c45" "#444444") (if (display-graphic-p) "#d3d3e7" "#d7d7ff"))))
 
     (custom-theme-set-faces
      theme-name
@@ -347,6 +348,7 @@
      `(org-agenda-done ((,class (:foreground ,(if (eq variant 'dark) suc 
green) :bold t))))
      `(org-agenda-structure ((,class (:weight bold :foreground ,type))))
      `(org-block ((,class (:foreground ,base))))
+     `(org-block-background ((,class (:background ,org-block-bg))))
      `(org-clock-overlay ((,class (:foreground ,type))))
      `(org-code ((,class (:foreground ,cyan))))
      `(org-column ((,class (:background ,highlight))))
@@ -375,9 +377,9 @@
      `(org-scheduled-today ((,class (:foreground ,func :weight bold :height 
1.2))))
      `(org-sexp-date ((,class (:foreground ,base))))
      `(org-special-keyword ((,class (:foreground ,func))))
-     `(org-table ((,class (:foreground ,base))))
+     `(org-table ((,class (:foreground ,yellow :background ,org-h4-bg))))
      `(org-todo ((,class (:foreground ,war :bold t :underline t))))
-     `(org-verbatim ((,class (:foreground ,base))))
+     `(org-verbatim ((,class (:foreground ,inf))))
      `(org-verse ((,class (:inherit org-block :slant italic))))
      `(org-warning ((,class (:foreground ,err))))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]