branch: elpa/spacemacs-theme
commit a01b4807131de930cc538b86b658e1b24a9c3bf0
Author: nashamri <[email protected]>
Commit: nashamri <[email protected]>
Refactor org headings colors names
---
spacemacs-common.el | 73 ++++++++++++++++++++++++++++-------------------------
1 file changed, 38 insertions(+), 35 deletions(-)
diff --git a/spacemacs-common.el b/spacemacs-common.el
index c8ce21c7c4..656898af85 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -87,20 +87,23 @@
(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-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")))
(org-ml (if (eq variant 'dark) (if (display-graphic-p)
"#ac641b" "#af5f00") (if (display-graphic-p) "#da8b55" "#df5f5f")))
;; 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)
"#29422d" "#262626") (if (display-graphic-p) "#dae6d0" "#ffffff")))
+ (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)
"#512e31" "#262626") (if (display-graphic-p) "#eed9d2" "#ffffff")))
+ (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")))
)
(custom-theme-set-faces
@@ -194,10 +197,10 @@
`(dired-warning ((,class (:foreground ,war))))
;;;;; ediff
- `(ediff-current-diff-A ((,class(:background ,red-bg :foreground ,red))))
- `(ediff-current-diff-Ancestor ((,class(:background ,org-h2-bg :foreground
,str))))
- `(ediff-current-diff-B ((,class(:background ,green-bg :foreground
,green))))
- `(ediff-current-diff-C ((,class(:background ,org-h1-bg :foreground
,keyword))))
+ `(ediff-current-diff-A ((,class(:background ,red-bg-s :foreground ,red))))
+ `(ediff-current-diff-Ancestor ((,class(:background ,aqua-bg :foreground
,aqua))))
+ `(ediff-current-diff-B ((,class(:background ,green-bg-s :foreground
,green))))
+ `(ediff-current-diff-C ((,class(:background ,blue-bg :foreground ,blue))))
`(ediff-even-diff-A ((,class(:background ,bg3))))
`(ediff-even-diff-Ancestor ((,class(:background ,bg3))))
`(ediff-even-diff-B ((,class(:background ,bg3))))
@@ -271,7 +274,7 @@
`(git-gutter-fr:modified ((,class (:foreground ,keyword :weight bold))))
;;;;; git-timemachine
- `(git-timemachine-minibuffer-detail-face ((,class (:foreground ,keyword
:bold t :background ,org-h1-bg))))
+ `(git-timemachine-minibuffer-detail-face ((,class (:foreground ,blue
:bold t :background ,blue-bg))))
;;;;; gnus
`(gnus-emphasis-highlight-words ((,class (:background ,(if (eq variant
'dark) err suc) :foreground ,(when (eq variant 'light) bg1)))))
@@ -358,20 +361,20 @@
`(linum-relative-current-face ((,class (:foreground ,comp))))
;;;;; magit
- `(magit-blame-culprit ((,class :background ,org-h4-bg :foreground
,yellow)))
- `(magit-blame-header ((,class :background ,org-h4-bg :foreground
,green)))
- `(magit-blame-sha1 ((,class :background ,org-h4-bg :foreground ,func)))
- `(magit-blame-subject ((,class :background ,org-h4-bg :foreground
,yellow)))
- `(magit-blame-time ((,class :background ,org-h4-bg :foreground
,green)))
- `(magit-blame-name ((,class :background ,org-h4-bg :foreground
,yellow)))
- `(magit-blame-heading ((,class :background ,org-h4-bg :foreground
,green)))
- `(magit-blame-hash ((,class :background ,org-h4-bg :foreground ,func)))
- `(magit-blame-summary ((,class :background ,org-h4-bg :foreground
,yellow)))
- `(magit-blame-date ((,class :background ,org-h4-bg :foreground
,green)))
+ `(magit-blame-culprit ((,class :background ,yellow-bg :foreground
,yellow)))
+ `(magit-blame-header ((,class :background ,yellow-bg :foreground
,green)))
+ `(magit-blame-sha1 ((,class :background ,yellow-bg :foreground ,func)))
+ `(magit-blame-subject ((,class :background ,yellow-bg :foreground
,yellow)))
+ `(magit-blame-time ((,class :background ,yellow-bg :foreground
,green)))
+ `(magit-blame-name ((,class :background ,yellow-bg :foreground
,yellow)))
+ `(magit-blame-heading ((,class :background ,yellow-bg :foreground
,green)))
+ `(magit-blame-hash ((,class :background ,yellow-bg :foreground ,func)))
+ `(magit-blame-summary ((,class :background ,yellow-bg :foreground
,yellow)))
+ `(magit-blame-date ((,class :background ,yellow-bg :foreground
,green)))
`(magit-branch ((,class (:foreground ,const :weight bold))))
- `(magit-branch-current ((,class (:background ,org-h1-bg :foreground
,keyword :weight bold :box t))))
- `(magit-branch-local ((,class (:background ,org-h1-bg :foreground
,keyword :weight bold))))
- `(magit-branch-remote ((,class (:background ,org-h2-bg :foreground ,str
:weight bold))))
+ `(magit-branch-current ((,class (:background ,blue-bg :foreground ,blue
:weight bold :box t))))
+ `(magit-branch-local ((,class (:background ,blue-bg :foreground ,blue
:weight bold))))
+ `(magit-branch-remote ((,class (:background ,aqua-bg :foreground ,aqua
:weight bold))))
`(magit-diff-context-highlight ((,class (:background ,bg2 :foreground
,base))))
`(magit-diff-file-header ((,class (:background ,comment-bg :foreground
,comment))))
`(magit-diff-file-heading ((,class (:background ,comment-bg :foreground
,comment))))
@@ -425,17 +428,17 @@
`(org-date-selected ((,class (:background ,func :foreground ,bg1) )))
`(org-document-info-keyword ((,class (:foreground ,org-ml))))
`(org-document-title ((,class (:foreground ,func :weight bold :height
,(if spacemacs-theme-org-height 1.4 1.0) :underline t))))
- `(org-done ((,class (:foreground ,(if (eq variant 'dark) suc green) :bold
t :background ,org-h3-bg))))
+ `(org-done ((,class (:foreground ,suc :bold t :background ,green-bg))))
`(org-ellipsis ((,class (:foreground ,keyword))))
`(org-footnote ((,class (:underline t :foreground ,base))))
`(org-hide ((,class (:foreground ,base))))
`(org-kbd ((,class (:inherit region :foreground ,base :box (:line-width 1
:style released-button)))))
- `(org-level-1 ((,class (:bold t :foreground ,keyword :height ,(if
spacemacs-theme-org-height 1.3 1.0) :background ,(when
spacemacs-theme-org-highlight org-h1-bg)))))
- `(org-level-2 ((,class (:bold t :foreground ,str :height ,(if
spacemacs-theme-org-height 1.2 1.0) :background ,(when
spacemacs-theme-org-highlight org-h2-bg)))))
- `(org-level-3 ((,class (:bold nil :foreground ,green :height ,(if
spacemacs-theme-org-height 1.1 1.0) :background ,(when
spacemacs-theme-org-highlight org-h3-bg)))))
- `(org-level-4 ((,class (:bold nil :foreground ,yellow :background ,(when
spacemacs-theme-org-highlight org-h4-bg)))))
- `(org-level-5 ((,class (:bold nil :foreground ,keyword))))
- `(org-level-6 ((,class (:bold nil :foreground ,str))))
+ `(org-level-1 ((,class (:bold t :foreground ,blue :height ,(if
spacemacs-theme-org-height 1.3 1.0) :background ,(when
spacemacs-theme-org-highlight blue-bg)))))
+ `(org-level-2 ((,class (:bold t :foreground ,aqua :height ,(if
spacemacs-theme-org-height 1.2 1.0) :background ,(when
spacemacs-theme-org-highlight aqua-bg)))))
+ `(org-level-3 ((,class (:bold nil :foreground ,green :height ,(if
spacemacs-theme-org-height 1.1 1.0) :background ,(when
spacemacs-theme-org-highlight green-bg)))))
+ `(org-level-4 ((,class (:bold nil :foreground ,yellow :background ,(when
spacemacs-theme-org-highlight yellow-bg)))))
+ `(org-level-5 ((,class (:bold nil :foreground ,blue))))
+ `(org-level-6 ((,class (:bold nil :foreground ,aqua))))
`(org-level-7 ((,class (:bold nil :foreground ,green))))
`(org-level-8 ((,class (:bold nil :foreground ,yellow))))
`(org-link ((,class (:underline t :foreground ,comment))))
@@ -447,8 +450,8 @@
`(org-scheduled-today ((,class (:foreground ,func :height ,(if
spacemacs-theme-org-height 1.2 1.0)))))
`(org-sexp-date ((,class (:foreground ,base))))
`(org-special-keyword ((,class (:foreground ,func))))
- `(org-table ((,class (:foreground ,yellow :background ,org-h4-bg))))
- `(org-todo ((,class (:foreground ,war :bold t :background ,org-h4-bg))))
+ `(org-table ((,class (:foreground ,yellow :background ,yellow-bg))))
+ `(org-todo ((,class (:foreground ,war :bold t :background ,yellow-bg))))
`(org-verbatim ((,class (:foreground ,keyword))))
`(org-verse ((,class (:inherit org-block :slant italic))))
`(org-warning ((,class (:foreground ,err))))
@@ -475,8 +478,8 @@
`(rainbow-delimiters-mismatched-face ((,class :foreground ,err :overline
t)))
;;;;; shm
- `(shm-current-face ((,class (:background ,green-bg))))
- `(shm-quarantine-face ((,class (:background ,red-bg))))
+ `(shm-current-face ((,class (:background ,green-bg-s))))
+ `(shm-quarantine-face ((,class (:background ,red-bg-s))))
;;;;; smartparens
`(sp-pair-overlay-face ((,class (:background ,highlight :foreground
nil))))
