[nongnu] elpa/spacemacs-theme 3dc15c690a 118/336: Reorder colors

[ELPA Syncer]

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

    Reorder colors
---
 spacemacs-common.el | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/spacemacs-common.el b/spacemacs-common.el
index b3f61416d5..090c72cbc1 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -54,38 +54,35 @@
   :group 'spacemacs-theme)
 
 (defun create-spacemacs-theme (variant theme-name)
-  (let ((class '((class color) (min-colors 89))) ;;                    ~~ Dark 
~~                                   ~~ Light ~~
+  (let ((class '((class color) (min-colors 89))) ;;                       ~~ 
Dark ~~                                   ~~ Light ~~
         ;;                                                               GUI   
    TER                                GUI       TER
+        ;; generic
+        (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")))
         (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")))
-        (keyword       (if (eq variant 'dark) (if (display-graphic-p) 
"#4f97d7" "#268bd2") (if (display-graphic-p) "#3a81c3" "#268bd2")))
+        (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")))
-        (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) 
"#2d9574" "#2aa198") (if (display-graphic-p) "#2d9574" "#2aa198")))
-        (type          (if (eq variant 'dark) (if (display-graphic-p) 
"#ce537a" "#df005f") (if (display-graphic-p) "#ba2f59" "#af005f")))
         (comp          (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) 
"#7590db" "#8787d7") (if (display-graphic-p) "#715ab1" "#af5fd7")))
         (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")))
+        (func          (if (eq variant 'dark) (if (display-graphic-p) 
"#bc6ec5" "#d75fd7") (if (display-graphic-p) "#6c3163" "#8700af")))
+        (highlight     (if (eq variant 'dark) (if (display-graphic-p) 
"#333c45" "#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")))
+        (m-line-brdr   (if (eq variant 'dark) (if (display-graphic-p) 
"#5d4d7a" "#111111") (if (display-graphic-p) "#b3b9be" "#b3b9be")))
+        (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) "#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")))
         (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) 
"#6b5d85" "#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")))
-        (inactive      (if (eq variant 'dark) (if (display-graphic-p) 
"#5d4d7a" "#111111") (if (display-graphic-p) "#9f8fbd" "#af87d7")))
-        (m-line-brdr   (if (eq variant 'dark) (if (display-graphic-p) 
"#5d4d7a" "#111111") (if (display-graphic-p) "#b3b9be" "#b3b9be")))
+        (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")))
         (org-cb        (if (eq variant 'dark) (if (display-graphic-p) 
"#cbc1d5" "#b2b2b2") (if (display-graphic-p) "#655370" "#5f5f87")))
         (org-cb-bg     (if (eq variant 'dark) (if (display-graphic-p) 
"#2f2b33" "#262626") (if (display-graphic-p) "#e8e3f0" "#ffffff")))
         (org-cb-ln     (if (eq variant 'dark) (if (display-graphic-p) 
"#827591" "#af5faf") (if (display-graphic-p) "#9380b2" "#af5fdf")))
@@ -95,10 +92,15 @@
         (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")))
         (org-ml        (if (eq variant 'dark) (if (display-graphic-p) 
"#ac641b" "#af5f00") (if (display-graphic-p) "#da8b55" "#df5f5f")))
-        (highlight     (if (eq variant 'dark) (if (display-graphic-p) 
"#333c45" "#444444") (if (display-graphic-p) "#d3d3e7" "#d7d7ff")))
-        (lnum          (if (eq variant 'dark) (if (display-graphic-p) 
"#44505c" "#444444") (if (display-graphic-p) "#a8a8bf" "#af87af")))
+
+        ;; colors
+        (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) 
"#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) 
"#512e31" "#262626") (if (display-graphic-p) "#eed9d2" "#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")))
         )
 
     (custom-theme-set-faces