branch: elpa/cyberpunk-theme
commit 08ac966ce38be4a3de0a6f6051b8763b5c85e534
Author: nemo <[email protected]>
Commit: nemo <[email protected]>
Support for magit v2+ added
---
cyberpunk-theme.el | 145 +++++++++++++++++++++++++----------------------------
1 file changed, 69 insertions(+), 76 deletions(-)
diff --git a/cyberpunk-theme.el b/cyberpunk-theme.el
index 83979ad..f730b3f 100644
--- a/cyberpunk-theme.el
+++ b/cyberpunk-theme.el
@@ -442,88 +442,81 @@
`(linum-relative-current-face ((,class (:inherit linum :foreground
,cyberpunk-white :weight bold))))
;; magit
- ;; `(magit-section-title ((,class (:foreground ,cyberpunk-pink-1))))
- ;; `(magit-branch ((,class (:foreground ,cyberpunk-yellow-5))))
- ;; `(magit-item-highlight ((,class (:background ,cyberpunk-gray-8))))
- ;; `(magit-diff-add ((,class (:foreground ,cyberpunk-green))))
- ;; `(magit-diff-del ((,class (:foreground ,cyberpunk-red))))
- ;; `(magit-diff-hunk-header ((,class (:foreground ,cyberpunk-orange))))
-
- ;; ;; magit headings and diffs
- ;; `(magit-section-highlight ((t (:background ,zenburn-bg+05))))
- ;; `(magit-section-heading ((t (:foreground ,zenburn-yellow
:weight bold))))
- ;; `(magit-section-heading-selection ((t (:foreground ,zenburn-orange
:weight bold))))
- ;; `(magit-diff-file-heading ((t (:weight bold))))
- ;; `(magit-diff-file-heading-highlight ((t (:background ,zenburn-bg+05
:weight bold))))
- ;; `(magit-diff-file-heading-selection ((t (:background ,zenburn-bg+05
- ;; :foreground ,zenburn-orange
:weight bold))))
- ;; `(magit-diff-hunk-heading ((t (:background ,zenburn-bg+1))))
- ;; `(magit-diff-hunk-heading-highlight ((t (:background ,zenburn-bg+2))))
- ;; `(magit-diff-hunk-heading-selection ((t (:background ,zenburn-bg+2
- ;; :foreground ,zenburn-orange))))
- ;; `(magit-diff-lines-heading ((t (:background ,zenburn-orange
- ;; :foreground ,zenburn-bg+2))))
- ;; `(magit-diff-context-highlight ((t (:background ,zenburn-bg+05
- ;; :foreground "grey70"))))
- ;; `(magit-diffstat-added ((t (:foreground ,zenburn-green+4))))
- ;; `(magit-diffstat-removed ((t (:foreground ,zenburn-red))))
- ;; ;; magit popup
- ;; `(magit-popup-heading ((t (:foreground ,zenburn-yellow
:weight bold))))
- ;; `(magit-popup-key ((t (:foreground ,zenburn-green-1
:weight bold))))
- ;; `(magit-popup-argument ((t (:foreground ,zenburn-green
:weight bold))))
- ;; `(magit-popup-disabled-argument ((t (:foreground ,zenburn-fg-1
:weight normal))))
- ;; `(magit-popup-option-value ((t (:foreground ,zenburn-blue-2
:weight bold))))
+ ;; magit headings and diffs
+ `(magit-section-highlight ((t (:background ,cyberpunk-bg+1))))
+ `(magit-section-heading ((t (:foreground ,cyberpunk-blue+1 :weight bold))))
+ `(magit-section-heading-selection ((t (:foreground ,cyberpunk-red+1 :weight
bold))))
+ `(magit-diff-file-heading ((t (:weight bold))))
+ `(magit-diff-file-heading-highlight ((t (:background ,cyberpunk-bg+2
:weight bold))))
+ `(magit-diff-file-heading-selection ((t (:background ,cyberpunk-bg+2
+ :foreground ,cyberpunk-blue-6
:weight bold))))
+ `(magit-diff-hunk-heading ((t (:background ,cyberpunk-bg))))
+ `(magit-diff-hunk-heading-highlight ((t (:background ,cyberpunk-bg+1))))
+ `(magit-diff-hunk-heading-selection ((t (:background ,cyberpunk-bg+1
+ :foreground ,cyberpunk-blue-6))))
+ `(magit-diff-lines-heading ((t (:background ,cyberpunk-blue-6
+ :foreground ,cyberpunk-bg+1))))
+ `(magit-diff-context-highlight ((t (:background ,cyberpunk-bg+2
+ :foreground ,cyberpunk-gray))))
+ `(magit-diffstat-added ((t (:foreground ,cyberpunk-blue-5))))
+ `(magit-diffstat-removed ((t (:foreground ,cyberpunk-magenta))))
+ ;; magit popup
+ `(magit-popup-heading ((t (:foreground ,cyberpunk-pink-1
:weight bold))))
+ `(magit-popup-key ((t (:foreground ,cyberpunk-blue+1
:weight bold))))
+ `(magit-popup-argument ((t (:foreground ,cyberpunk-blue-4
:weight bold))))
+ `(magit-popup-disabled-argument ((t (:foreground ,cyberpunk-fg :weight
normal))))
+ `(magit-popup-option-value ((t (:foreground ,cyberpunk-blue-2
:weight bold))))
;; ;; magit process
- ;; `(magit-process-ok ((t (:foreground ,zenburn-green :weight bold))))
- ;; `(magit-process-ng ((t (:foreground ,zenburn-red :weight bold))))
+ `(magit-process-ok ((t (:foreground ,cyberpunk-green+1 :weight bold))))
+ `(magit-process-ng ((t (:foreground ,cyberpunk-pink-2 :weight bold))))
;; ;; magit log
- ;; `(magit-log-author ((t (:foreground ,zenburn-orange))))
- ;; `(magit-log-date ((t (:foreground ,zenburn-fg-1))))
- ;; `(magit-log-graph ((t (:foreground ,zenburn-fg+1))))
+ `(magit-log-author ((t (:foreground ,cyberpunk-pink))))
+ `(magit-log-date ((t (:foreground ,cyberpunk-gray))))
+ `(magit-log-graph ((t (:foreground ,cyberpunk-white-2))))
;; ;; magit sequence
- ;; `(magit-sequence-pick ((t (:foreground ,zenburn-yellow-2))))
- ;; `(magit-sequence-stop ((t (:foreground ,zenburn-green))))
- ;; `(magit-sequence-part ((t (:foreground ,zenburn-yellow))))
- ;; `(magit-sequence-head ((t (:foreground ,zenburn-blue))))
- ;; `(magit-sequence-drop ((t (:foreground ,zenburn-red))))
- ;; `(magit-sequence-done ((t (:foreground ,zenburn-fg-1))))
- ;; `(magit-sequence-onto ((t (:foreground ,zenburn-fg-1))))
+ `(magit-sequence-pick ((t (:foreground ,cyberpunk-magenta))))
+ `(magit-sequence-stop ((t (:foreground ,cyberpunk-green+1))))
+ `(magit-sequence-part ((t (:foreground ,cyberpunk-pink-1))))
+ `(magit-sequence-head ((t (:foreground ,cyberpunk-blue+1))))
+ `(magit-sequence-drop ((t (:foreground ,cyberpunk-orange))))
+ `(magit-sequence-done ((t (:foreground ,cyberpunk-gray-2))))
+ `(magit-sequence-onto ((t (:foreground ,cyberpunk-gray-2))))
;; ;; magit bisect
- ;; `(magit-bisect-good ((t (:foreground ,zenburn-green))))
- ;; `(magit-bisect-skip ((t (:foreground ,zenburn-yellow))))
- ;; `(magit-bisect-bad ((t (:foreground ,zenburn-red))))
+ `(magit-bisect-good ((t (:foreground ,cyberpunk-green+1))))
+ `(magit-bisect-skip ((t (:foreground ,cyberpunk-pink-1))))
+ `(magit-bisect-bad ((t (:foreground ,cyberpunk-orange))))
;; ;; magit blame
- ;; `(magit-blame-heading ((t (:background ,zenburn-bg-1 :foreground
,zenburn-blue-2))))
- ;; `(magit-blame-hash ((t (:background ,zenburn-bg-1 :foreground
,zenburn-blue-2))))
- ;; `(magit-blame-name ((t (:background ,zenburn-bg-1 :foreground
,zenburn-orange))))
- ;; `(magit-blame-date ((t (:background ,zenburn-bg-1 :foreground
,zenburn-orange))))
- ;; `(magit-blame-summary ((t (:background ,zenburn-bg-1 :foreground
,zenburn-blue-2
- ;; :weight bold))))
+ `(magit-blame-heading ((t (:background ,cyberpunk-bg+1 :foreground
,cyberpunk-green))))
+ `(magit-blame-hash ((t (:background ,cyberpunk-bg+1 :foreground
,cyberpunk-green))))
+ `(magit-blame-name ((t (:background ,cyberpunk-bg+1 :foreground
,cyberpunk-pink-1))))
+ `(magit-blame-date ((t (:background ,cyberpunk-bg+1 :foreground
,cyberpunk-yellow-1))))
+ `(magit-blame-summary ((t (:background ,cyberpunk-bg+1 :foreground
,cyberpunk-blue-4
+ :weight bold))))
;; ;; magit references etc
- ;; `(magit-dimmed ((t (:foreground ,zenburn-bg+3))))
- ;; `(magit-hash ((t (:foreground ,zenburn-bg+3))))
- ;; `(magit-tag ((t (:foreground ,zenburn-orange :weight bold))))
- ;; `(magit-branch-remote ((t (:foreground ,zenburn-green :weight bold))))
- ;; `(magit-branch-local ((t (:foreground ,zenburn-blue :weight bold))))
- ;; `(magit-branch-current ((t (:foreground ,zenburn-blue :weight bold
:box t))))
- ;; `(magit-head ((t (:foreground ,zenburn-blue :weight bold))))
- ;; `(magit-refname ((t (:background ,zenburn-bg+2 :foreground
,zenburn-fg :weight bold))))
- ;; `(magit-refname-stash ((t (:background ,zenburn-bg+2 :foreground
,zenburn-fg :weight bold))))
- ;; `(magit-refname-wip ((t (:background ,zenburn-bg+2 :foreground
,zenburn-fg :weight bold))))
- ;; `(magit-signature-good ((t (:foreground ,zenburn-green))))
- ;; `(magit-signature-bad ((t (:foreground ,zenburn-red))))
- ;; `(magit-signature-untrusted ((t (:foreground ,zenburn-yellow))))
- ;; `(magit-cherry-unmatched ((t (:foreground ,zenburn-cyan))))
- ;; `(magit-cherry-equivalent ((t (:foreground ,zenburn-magenta))))
- ;; `(magit-reflog-commit ((t (:foreground ,zenburn-green))))
- ;; `(magit-reflog-amend ((t (:foreground ,zenburn-magenta))))
- ;; `(magit-reflog-merge ((t (:foreground ,zenburn-green))))
- ;; `(magit-reflog-checkout ((t (:foreground ,zenburn-blue))))
- ;; `(magit-reflog-reset ((t (:foreground ,zenburn-red))))
- ;; `(magit-reflog-rebase ((t (:foreground ,zenburn-magenta))))
- ;; `(magit-reflog-cherry-pick ((t (:foreground ,zenburn-green))))
- ;; `(magit-reflog-remote ((t (:foreground ,zenburn-cyan))))
- ;; `(magit-reflog-other ((t (:foreground ,zenburn-cyan))))
+ `(magit-dimmed ((t (:foreground ,cyberpunk-bg+3))))
+ `(magit-hash ((t (:foreground ,cyberpunk-bg+1))))
+ `(magit-tag ((t (:foreground ,cyberpunk-pink-1 :weight bold))))
+ `(magit-branch-remote ((t (:foreground ,cyberpunk-green+2 :weight bold))))
+ `(magit-branch-local ((t (:foreground ,cyberpunk-blue+1 :weight bold))))
+ `(magit-branch-current ((t (:foreground ,cyberpunk-green :weight bold
:box t))))
+ `(magit-head ((t (:foreground ,cyberpunk-blue :weight bold))))
+ `(magit-refname ((t (:background ,cyberpunk-bg+2 :foreground
,cyberpunk-fg :weight bold))))
+ `(magit-refname-stash ((t (:background ,cyberpunk-bg+2 :foreground
,cyberpunk-fg :weight bold))))
+ `(magit-refname-wip ((t (:background ,cyberpunk-bg+2 :foreground
,cyberpunk-fg :weight bold))))
+ `(magit-signature-good ((t (:foreground ,cyberpunk-green))))
+ `(magit-signature-bad ((t (:foreground ,cyberpunk-red))))
+ `(magit-signature-untrusted ((t (:foreground ,cyberpunk-yellow))))
+ `(magit-cherry-unmatched ((t (:foreground ,cyberpunk-cyan))))
+ `(magit-cherry-equivalent ((t (:foreground ,cyberpunk-magenta))))
+ `(magit-reflog-commit ((t (:foreground ,cyberpunk-green))))
+ `(magit-reflog-amend ((t (:foreground ,cyberpunk-magenta))))
+ `(magit-reflog-merge ((t (:foreground ,cyberpunk-green))))
+ `(magit-reflog-checkout ((t (:foreground ,cyberpunk-blue))))
+ `(magit-reflog-reset ((t (:foreground ,cyberpunk-red))))
+ `(magit-reflog-rebase ((t (:foreground ,cyberpunk-magenta))))
+ `(magit-reflog-cherry-pick ((t (:foreground ,cyberpunk-green))))
+ `(magit-reflog-remote ((t (:foreground ,cyberpunk-cyan))))
+ `(magit-reflog-other ((t (:foreground ,cyberpunk-cyan))))
`(eval-sexp-fu-flash ((,class (:background ,cyberpunk-gray-8 :foreground
,cyberpunk-pink-2))))
