branch: elpa/spacemacs-theme
commit 536892b0394974b052cdb770e3a552389f1e9b01
Author: nashamri <[email protected]>
Commit: nashamri <[email protected]>
Magit in a good shape now
---
spacemacs-dark-theme.el | 32 ++++++++++++++++++++------------
spacemacs-light-theme.el | 43 +++++++++++++++++++++++++++++--------------
2 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/spacemacs-dark-theme.el b/spacemacs-dark-theme.el
index e58f66ea93..f059320b29 100644
--- a/spacemacs-dark-theme.el
+++ b/spacemacs-dark-theme.el
@@ -246,25 +246,33 @@
`(linum ((,class (:foreground ,str :background ,bg2))))
;;;;; magit
- `(magit-blame-sha1 ((,class :background ,comment-bg :foreground ,func)))
- `(magit-blame-time ((,class :foreground ,key1)))
- `(magit-item-highlight ((,class :background ,bg2)))
- `(magit-section-heading ((,class (:foreground ,keyword :weight
bold))))
- `(magit-hunk-heading ((,class (:background ,bg3))))
- `(magit-section-highlight ((,class (:background ,bg2))))
- `(magit-section-title ((,class (:background ,bg1 :foreground ,builtin
:weight bold))))
- `(magit-hunk-heading-highlight ((,class (:background ,bg3))))
+ `(magit-blame-sha1 ((,class :background ,bg3 :foreground ,func)))
+ `(magit-blame-time ((,class :background ,bg3 :foreground ,key1)))
+ `(magit-blame-header ((,class :background ,bg3 :foreground ,key1)))
+ `(magit-blame-subject ((,class :background ,bg3 :foreground ,base)))
+ `(magit-blame-culprit ((,class :background ,bg3 :foreground ,str)))
+ `(magit-branch ((,class (:foreground ,const :weight bold))))
`(magit-diff-hunk-header ((,class (:background nil :foreground ,builtin))))
`(magit-diff-file-header ((,class (:background nil :foreground ,str))))
`(magit-diff-context-highlight ((,class (:background ,bg3 :foreground
,base))))
`(magit-diffstat-added ((,class (:foreground ,type))))
`(magit-diffstat-removed ((,class (:foreground ,var))))
+ `(magit-hash ((,class (:foreground ,base))))
+ `(magit-hunk-heading ((,class (:background ,bg3))))
+ `(magit-hunk-heading-highlight ((,class (:background ,bg3))))
+ `(magit-log-author ((,class (:foreground ,base))))
+ `(magit-log-head-label-remote ((,class (:background ,suc :foreground ,bg1
:bold t))))
+ `(magit-log-head-label-local ((,class (:background ,inf :foreground ,bg1
:bold t))))
+ `(magit-log-head-label-tags ((,class (:background ,violet :foreground ,bg1
:bold t))))
+ `(magit-log-head-label-wip ((,class (:background ,cyan :foreground ,bg1
:bold t))))
+ `(magit-log-head-label-head ((,class (:background ,yellow :foreground ,bg1
:bold t))))
+ `(magit-log-sha1 ((,class (:foreground ,str))))
+ `(magit-item-highlight ((,class :background ,bg2)))
`(magit-process-ok ((,class (:foreground ,func :weight bold))))
`(magit-process-ng ((,class (:foreground ,war :weight bold))))
- `(magit-branch ((,class (:foreground ,const :weight bold))))
- `(magit-log-author ((,class (:foreground ,base))))
- `(magit-hash ((,class (:foreground ,base))))
- `(magit-diff-file-header ((,class (:foreground ,base :background ,bg3))))
+ `(magit-section-heading ((,class (:foreground ,keyword :weight
bold))))
+ `(magit-section-highlight ((,class (:background ,bg2))))
+ `(magit-section-title ((,class (:background ,bg1 :foreground ,builtin
:weight bold))))
;;;;; other, need more work
`(custom-button ((,class (:background ,yellow))))
diff --git a/spacemacs-light-theme.el b/spacemacs-light-theme.el
index b935cc2fe3..f7136ccf01 100644
--- a/spacemacs-light-theme.el
+++ b/spacemacs-light-theme.el
@@ -244,6 +244,35 @@
;;;;; linum-mode
`(linum ((,class (:foreground ,str :background ,bg2))))
+;;;;; magit
+ `(magit-blame-sha1 ((,class :background ,bg3 :foreground ,func)))
+ `(magit-blame-time ((,class :background ,bg3 :foreground ,key1)))
+ `(magit-blame-header ((,class :background ,bg3 :foreground ,key1)))
+ `(magit-blame-subject ((,class :background ,bg3 :foreground ,base)))
+ `(magit-blame-culprit ((,class :background ,bg3 :foreground ,str)))
+ `(magit-branch ((,class (:foreground ,const :weight bold))))
+ `(magit-diff-hunk-header ((,class (:background nil :foreground ,builtin))))
+ `(magit-diff-file-header ((,class (:background nil :foreground ,str))))
+ `(magit-diff-context-highlight ((,class (:background ,bg3 :foreground
,base))))
+ `(magit-diffstat-added ((,class (:foreground ,type))))
+ `(magit-diffstat-removed ((,class (:foreground ,var))))
+ `(magit-hash ((,class (:foreground ,base))))
+ `(magit-hunk-heading ((,class (:background ,bg3))))
+ `(magit-hunk-heading-highlight ((,class (:background ,bg3))))
+ `(magit-log-author ((,class (:foreground ,base))))
+ `(magit-log-head-label-remote ((,class (:background ,suc :foreground ,bg1
:bold t))))
+ `(magit-log-head-label-local ((,class (:background ,inf :foreground ,bg1
:bold t))))
+ `(magit-log-head-label-tags ((,class (:background ,violet :foreground ,bg1
:bold t))))
+ `(magit-log-head-label-wip ((,class (:background ,cyan :foreground ,bg1
:bold t))))
+ `(magit-log-head-label-head ((,class (:background ,yellow :foreground ,bg1
:bold t))))
+ `(magit-log-sha1 ((,class (:foreground ,str))))
+ `(magit-item-highlight ((,class :background ,bg2)))
+ `(magit-process-ok ((,class (:foreground ,func :weight bold))))
+ `(magit-process-ng ((,class (:foreground ,war :weight bold))))
+ `(magit-section-heading ((,class (:foreground ,keyword :weight
bold))))
+ `(magit-section-highlight ((,class (:background ,bg2))))
+ `(magit-section-title ((,class (:background ,bg1 :foreground ,builtin
:weight bold))))
+
;;;;; other, need more work
`(org-code ((,class (:foreground ,base))))
`(org-hide ((,class (:foreground ,base))))
@@ -313,20 +342,6 @@
`(undo-tree-visualizer-register-face ((,class :foreground ,type)))
`(slime-repl-inputed-output-face ((,class (:foreground ,type))))
`(trailing-whitespace ((,class :foreground nil :background ,err)))
- `(magit-item-highlight ((,class :background ,bg3)))
- `(magit-section-heading ((,class (:foreground ,keyword :weight
bold))))
- `(magit-hunk-heading ((,class (:background ,bg3))))
- `(magit-section-highlight ((,class (:background ,bg2))))
- `(magit-hunk-heading-highlight ((,class (:background ,bg3))))
- `(magit-diff-context-highlight ((,class (:background ,bg3 :foreground
,base))))
- `(magit-diffstat-added ((,class (:foreground ,type))))
- `(magit-diffstat-removed ((,class (:foreground ,var))))
- `(magit-process-ok ((,class (:foreground ,func :weight bold))))
- `(magit-process-ng ((,class (:foreground ,war :weight bold))))
- `(magit-branch ((,class (:foreground ,const :weight bold))))
- `(magit-log-author ((,class (:foreground ,base))))
- `(magit-hash ((,class (:foreground ,base))))
- `(magit-diff-file-header ((,class (:foreground ,base :background ,bg3))))
`(term ((,class (:foreground ,base :background ,bg1))))
`(term-color-black ((,class (:foreground ,bg3))))
`(term-color-blue ((,class (:foreground ,inf))))
