branch: elpa/spacemacs-theme
commit 4349c6c89fc8e7b942aefb855f5bbd024a05d700
Author: nashamri <[email protected]>
Commit: nashamri <[email protected]>
Refactor org code blocks and modeline border
---
spacemacs-common.el | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/spacemacs-common.el b/spacemacs-common.el
index 090c72cbc1..c8ce21c7c4 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -64,6 +64,11 @@
(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")))
@@ -74,7 +79,6 @@
(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")))
(ttip (if (eq variant 'dark) (if (display-graphic-p)
"#9a9aba" "#888888") (if (display-graphic-p) "#8c799f" "#5f5f87")))
@@ -83,10 +87,6 @@
(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")))
- (org-cb-ln-bg (if (eq variant 'dark) (if (display-graphic-p)
"#373040" "#333333") (if (display-graphic-p) "#ddd8eb" "#dfdfff")))
(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")))
@@ -168,7 +168,7 @@
;;;;; diff
`(diff-added ((,class :background nil :foreground ,green)))
`(diff-changed ((,class :background nil :foreground ,keyword)))
- `(diff-header ((,class :background ,org-cb-ln-bg :foreground
,func)))
+ `(diff-header ((,class :background ,cblk-ln-bg :foreground
,func)))
`(diff-indicator-added ((,class :background nil :foreground ,green)))
`(diff-indicator-changed ((,class :background nil :foreground ,keyword)))
`(diff-indicator-removed ((,class :background nil :foreground ,red)))
@@ -397,8 +397,8 @@
`(magit-section-title ((,class (:background ,bg1 :foreground ,keyword
:weight bold))))
;;;;; mode-line
- `(mode-line ((,class (:foreground ,base :background ,active1
:box (:color ,m-line-brdr :line-width 1)))))
- `(mode-line-inactive ((,class (:foreground ,base :background ,bg1
:box (:color ,m-line-brdr :line-width 1)))))
+ `(mode-line ((,class (:foreground ,base :background ,active1
:box (:color ,border :line-width 1)))))
+ `(mode-line-inactive ((,class (:foreground ,base :background ,bg1
:box (:color ,border :line-width 1)))))
`(mode-line-buffer-id ((,class (:bold t :foreground ,func))))
;;;;; neotree
@@ -414,9 +414,9 @@
`(org-agenda-date-weekend ((,class (:weight bold :foreground ,var))))
`(org-agenda-done ((,class (:foreground ,(if (eq variant 'dark) suc
green) :height ,(if spacemacs-theme-org-height 1.2 1.0)))))
`(org-agenda-structure ((,class (:weight bold :foreground ,comp))))
- `(org-block ((,class (:background ,org-cb-bg :foreground ,org-cb))))
- `(org-block-begin-line ((,class (:background ,org-cb-ln-bg :foreground
,org-cb-ln))))
- `(org-block-end-line ((,class (:background ,org-cb-ln-bg :foreground
,org-cb-ln))))
+ `(org-block ((,class (:background ,cblk-bg :foreground ,cblk))))
+ `(org-block-begin-line ((,class (:background ,cblk-ln-bg :foreground
,cblk-ln))))
+ `(org-block-end-line ((,class (:background ,cblk-ln-bg :foreground
,cblk-ln))))
`(org-clock-overlay ((,class (:foreground ,comp))))
`(org-code ((,class (:foreground ,cyan))))
`(org-column ((,class (:background ,highlight))))
