commit 864f7ce98c0184b8d36aaae696c0c4a20699e535
parent af1e0ba2edac5a8a28e0dbb3064d2be51ee773ba
Author: Bozhidar Batsov <bozhidar.batsov@gmail.com>
Date: Thu, 19 Apr 2012 03:06:27 -0700
Merge pull request #22 from thomasf/org-color-4
Org mode colors (and a bunch of other stuff)
Diffstat:
| M | solarized-theme.el | | | 69 | +++++++++++++++++++++++++++++++++++++++++++++++++++++---------------- |
1 file changed, 53 insertions(+), 16 deletions(-)
diff --git a/solarized-theme.el b/solarized-theme.el
@@ -58,6 +58,8 @@
(base2 "#eee8d5")
;; background light
(base3 "#fdf6e3")
+
+ ;; Solarized accented colors
(yellow "#b58900")
(orange "#cb4b16")
(red "#dc322f")
@@ -67,11 +69,50 @@
(cyan "#2aa198")
(green "#859900")
+ ;; Darker and lighter accented colors
+ ;; Only use these in exceptional circumstances!
+ (yellow-d "#7B5800")
+ (yellow-l "#F1BE46")
+ (orange-d "#8D0F00")
+ (orange-l "#FF8149")
+ (red-d "#9C0001")
+ (red-l "#FF6F5E")
+ (magenta-d "#970051")
+ (magenta-l "#FF72B7")
+ (violet-d "#34418E")
+ (violet-l "#A3A5FD")
+ (blue-d "#00599B")
+ (blue-l "#70C0FF")
+ (cyan-d "#006D65")
+ (cyan-l "#6BD8CE")
+ (green-d "#4F6600")
+ (green-l "#BECF48")
+
+ ;; Light/Dark adaptive solarized colors
(solarized-fg (if (eq variant 'light) base00 base0))
(solarized-bg (if (eq variant 'light) base3 base03))
(solarized-hl (if (eq variant 'light) base2 base02))
(solarized-emph (if (eq variant 'light) base01 base1))
- (solarized-comments (if (eq variant 'light) base1 base01)))
+ (solarized-comments (if (eq variant 'light) base1 base01))
+
+ ;; Light/Dark adaptive higher/lower contrast accented colors
+ ;; Only use these in exceptional cirmumstances!
+ (yellow-hc (if (eq variant 'light) yellow-d yellow-l))
+ (yellow-lc (if (eq variant 'light) yellow-l yellow-d))
+ (orange-hc (if (eq variant 'light) orange-d orange-l))
+ (orange-lc (if (eq variant 'light) orange-l orange-d))
+ (red-hc (if (eq variant 'light) red-d red-l))
+ (red-lc (if (eq variant 'light) red-l red-d))
+ (magenta-hc (if (eq variant 'light) magenta-d magenta-l))
+ (magenta-lc (if (eq variant 'light) magenta-l magenta-d))
+ (violet-hc (if (eq variant 'light) violet-d violet-l))
+ (violet-lc (if (eq variant 'light) violet-l violet-d))
+ (blue-hc (if (eq variant 'light) blue-d blue-l))
+ (blue-lc (if (eq variant 'light) blue-l blue-d))
+ (cyan-hc (if (eq variant 'light) cyan-d cyan-l))
+ (cyan-lc (if (eq variant 'light) cyan-l cyan-d))
+ (green-hc (if (eq variant 'light) green-d green-l))
+ (green-lc (if (eq variant 'light) green-l green-d)))
(custom-theme-set-faces
(if (eq variant 'light) 'solarized-light 'solarized-dark)
'(button ((t (:underline t))))
@@ -346,6 +387,7 @@
`(org-block-begin-line ((,class (:foreground ,solarized-comments :slant italic))))
`(org-checkbox ((,class (:background ,solarized-bg :foreground ,solarized-fg
:box (:line-width 1 :style released-button)))))
+ `(org-code ((,class (:foreground ,solarized-comments))))
`(org-date ((,class (:foreground ,blue :underline t))))
`(org-done ((,class (:bold t :weight bold :foreground ,green))))
`(org-ellipsis ((,class (:foreground ,solarized-comments))))
@@ -362,8 +404,7 @@
`(org-level-8 ((,class (:foreground ,blue))))
`(org-link ((,class (:foreground ,yellow :underline t))))
`(org-scheduled ((,class (:foreground ,green))))
- `(org-scheduled-previously
- ((,class (:foreground ,orange))))
+ `(org-scheduled-previously ((,class (:foreground ,orange))))
`(org-scheduled-today ((,class (:bold t :foreground ,blue :weight bold))))
`(org-special-keyword ((,class (:foreground ,yellow))))
`(org-table ((,class (:foreground ,green))))
@@ -372,19 +413,15 @@
`(org-todo ((,class (:bold t :foreground ,red :weight bold))))
`(org-upcoming-deadline ((,class (:bold t :foreground ,yellow ))))
`(org-warning ((,class (:bold t :foreground ,orange :weight bold :underline t))))
- ;; org-habit
- `(org-habit-clear-face ((,class ,(if (eq variant 'light)
- `(:foreground ,base02 :background "#bbbbff")
- `(:foreground ,base01 :background "blue")))))
- `(org-habit-clear-future-face ((,class (:foreground ,(if (eq variant 'light) base02 base00)))))
- `(org-habit-ready-face ((,class ,(if (eq variant 'light)
- `(:foreground ,base02 :background "#aaffbb")
- `(:foreground ,base02 :background "forestgreen")))))
- `(org-habit-ready-future-face ((,class (:foreground ,base01))))
- `(org-habit-alert-face ((,class (:foreground ,base01))))
- `(org-habit-alert-future-face ((,class (:foreground ,base02))))
- `(org-habit-overdue-face ((,class (:foreground ,base01))))
- `(org-habit-overdue-future-face ((,class (:foreground ,base01))))
+ ;; org-habit (clear=blue, ready=green, alert=yellow, overdue=red. future=lower contrast)
+ `(org-habit-clear-face ((,class (:background ,blue-lc, :foreground ,blue-hc))))
+ `(org-habit-clear-future-face ((,class (:background ,blue-lc))))
+ `(org-habit-ready-face ((,class (:background ,green-lc :foreground ,green))))
+ `(org-habit-ready-future-face ((,class (:background ,green-lc))))
+ `(org-habit-alert-face ((,class (:background ,yellow-hc :foreground ,yellow-lc))))
+ `(org-habit-alert-future-face ((,class (:background ,yellow-lc))))
+ `(org-habit-overdue-face ((,class (:background ,red-hc :foreground ,red-lc))))
+ `(org-habit-overdue-future-face ((,class (:background ,red-lc))))
;; outline
`(outline-8 ((,class (:inherit default))))
