Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix org-mode todo and done faces #21

Closed
wants to merge 3 commits into from
Closed

Fix org-mode todo and done faces #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb476e3
Customized to my liking
Dec 30, 2012
573ee44
Add .gitignore
Dec 30, 2012
dec8713
Rearrange outline colors
Dec 31, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.elc
38 changes: 22 additions & 16 deletions solarized-definitions.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(violet (find-color 'violet))
(blue (find-color 'blue))
(cyan (find-color 'cyan))

(green (find-color 'green))
(bold (if solarized-bold 'bold 'normal))
(bright-bold (if solarized-bold 'normal 'bold))
Expand Down Expand Up @@ -192,8 +193,8 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(isearch ((t (,@fmt-stnd ,@fg-orange ,@bg-back)))) ; IncSearch
(isearch-fail ((t (,@fmt-stnd ,@fg-orange ,@bg-back)))) ; IncSearch
(lazy-highlight ((t (,@fmt-revr ,@fg-yellow ,@bg-back)))) ; Search
(link ((t (,@fmt-undr ,@fg-violet))))
(link-visited ((t (,@fmt-undr ,@fg-magenta))))
(link ((t (,@fmt-undr))))
(link-visited ((t (,@fmt-undr))))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These have changed a bit since then, they now match what the Vim theme uses for pandocLinkText.

(menu ((t (,@fg-base0 ,@bg-base02))))
(minibuffer-prompt ((t (,@fmt-bold ,@fg-cyan)))) ; Question
(mode-line ; StatusLine
Expand Down Expand Up @@ -316,25 +317,30 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(org-hide ((t (,@fg-base03))))
(org-todo ((t (,@fmt-bold ,@fg-base03 ,@bg-red))))
(org-done ((t (,@fmt-bold ,@fg-green))))
(org-todo-kwd-face ((t (,@fg-red ,@bg-base03))))
(org-done-kwd-face ((t (,@fg-green ,@bg-base03))))
(org-todo-kwd-face ((t (,@fg-red ,@bg-base03 :box (:line-width 1 :color ,red :style released-button)))))
(org-done-kwd-face ((t (,@fg-green ,@bg-base03 :box (:line-width 1 :color ,green :style released-button)))))
(org-project-kwd-face ((t (,@fg-violet ,@bg-base03))))
(org-waiting-kwd-face ((t (,@fg-orange ,@bg-base03))))
(org-someday-kwd-face ((t (,@fg-blue ,@bg-base03))))
(org-started-kwd-face ((t (,@fg-yellow ,@bg-base03))))
(org-cancelled-kwd-face ((t (,@fg-green ,@bg-base03))))
(org-delegated-kwd-face ((t (,@fg-cyan ,@bg-base03))))
(org-someday-kwd-face ((t (,@fg-magenta ,@bg-base03 :box (:line-width 1 :color ,magenta :style released-button)))))
(org-appt-kwd-face ((t (,@fg-orange ,@bg-base03 :box (:line-width 1 :color ,orange :style released-button)))))
(org-waiting-kwd-face ((t (,@fg-orange ,@bg-base03 :box (:line-width 1 :color ,orange :style released-button)))))
(org-started-kwd-face ((t (,@fg-yellow ,@bg-base03 :box (:line-width 1 :color ,yellow :style released-button)))))
(org-next-kwd-face ((t (,@fg-base03 ,@bg-yellow))))
(org-cancelled-kwd-face ((t (,@fg-cyan ,@bg-base03 :box (:line-width 1 :color ,cyan :style released-button)))))
(org-delegated-kwd-face ((t (,@fg-cyan ,@bg-base03 :box (:line-width 1 :color ,cyan :style released-button)))))
(org-deferred-kwd-face ((t (,@fg-cyan ,@bg-base03 :box (:line-width 1 :color ,cyan :style released-button)))))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These faces are probably good, but they’re not in the vein of the original Vim Solarized theme.

I’m in the process of applying something like #191 to make it easier to extend Solarized, so that you could add these faces locally by doing something like

(deftheme huyz-solarized "Extensions to the Solarized theme.")
(apply #'custom-theme-set-faces 'huyz-solarized
       (solarized-with-color-variables
        `((org-todo-kwd-face ((t (,@fg-red ,@bg-base03 :box (:line-width 1 :color ,red :style released-button)))))
           (org-done-kwd-face ((t (,@fg-green ,@bg-base03 :box (:line-width 1 :color ,green :style released-button)))))
           (org-someday-kwd-face ((t (,@fg-magenta ,@bg-base03 :box (:line-width 1 :color ,magenta :style released-button)))))
           (org-appt-kwd-face ((t (,@fg-orange ,@bg-base03 :box (:line-width 1 :color ,orange :style released-button)))))
           (org-waiting-kwd-face ((t (,@fg-orange ,@bg-base03 :box (:line-width 1 :color ,orange :style released-button)))))
           (org-started-kwd-face ((t (,@fg-yellow ,@bg-base03 :box (:line-width 1 :color ,yellow :style released-button)))))
           (org-next-kwd-face ((t (,@fg-base03 ,@bg-yellow))))
           (org-cancelled-kwd-face ((t (,@fg-cyan ,@bg-base03 :box (:line-width 1 :color ,cyan :style released-button)))))
           (org-delegated-kwd-face ((t (,@fg-cyan ,@bg-base03 :box (:line-width 1 :color ,cyan :style released-button)))))
           (org-deferred-kwd-face ((t (,@fg-cyan ,@bg-base03 :box (:line-width 1 :color ,cyan :style released-button)))))))

(customize-set-variables
 '(custom-enabled-themes (huyz-solarized solarized))

I actually do something similar locally, because I don’t always agree with Solarized, and I plan to add some variants to the repo as well, but I want this theme to match the original as much as possible.

;; huy: org
(org-date ((t (:underline t))))
;; table
(table-cell ((t (,@fmt-none ,@fg-base0 ,@bg-back))))
;; outline - pandocBlockQuoteLeader*
(outline-1 ((t (,@fmt-none ,@fg-blue))))
(outline-2 ((t (,@fmt-none ,@fg-cyan))))
(outline-3 ((t (,@fmt-none ,@fg-yellow))))
(outline-4 ((t (,@fmt-none ,@fg-red))))
(outline-5 ((t (,@fmt-none ,@fg-base0))))
(outline-6 ((t (,@fmt-none ,@fg-base01))))
(outline-1 ((t (,@fmt-none ,@fg-base3))))
(outline-2 ((t (,@fmt-none ,@fg-blue))))
(outline-3 ((t (,@fmt-none ,@fg-cyan))))
(outline-4 ((t (,@fmt-none ,@fg-green))))
(outline-5 ((t (,@fmt-none ,@fg-violet))))
(outline-6 ((t (,@fmt-none ,@fg-yellow))))
(outline-7 ((t (,@fmt-none ,@fg-orange))))
(outline-8 ((t (,@fmt-none ,@fg-violet))))
(outline-8 ((t (,@fmt-none ,@fg-blue))))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These faces (at least the first 6) are selected to match the original theme, but again, can be overridden locally once I have #191 merged.

;; speedbar
(speedbar-button-face ((t (,@fmt-none ,@fg-base1))))
(speedbar-directory-face ((t (,@fmt-none ,@fg-orange))))
Expand Down