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

Add faces for dired+ #193

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Add faces for dired+ #193

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
39c2062
Add faces for dired+
ytaka Mar 27, 2016
4dadff0
Merge branch 'master' into customize
ytaka Dec 30, 2017
f94690f
Only change bg color of faces in bm.el
ytaka Apr 21, 2018
bf83377
Improve colors of helm
ytaka Apr 21, 2018
c6c185a
Faces in mode line
ytaka Apr 21, 2018
a0490ed
Customize
ytaka Apr 9, 2021
c2e7eca
Use cl-rotatef
ytaka Dec 9, 2022
61611be
Settings for helm-ff-file-extension
ytaka Dec 9, 2022
4c54eb2
For emacs ipython notebook
ytaka Dec 9, 2022
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
57 changes: 51 additions & 6 deletions solarized-definitions.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(italic (if solarized-italic 'italic 'unspecified)))
(cond ((eq 'high solarized-contrast)
(let ((orig-base3 base3))
(rotatef base01 base00 base0 base1 base2 base3)
(cl-rotatef base01 base00 base0 base1 base2 base3)
Copy link
Owner

Choose a reason for hiding this comment

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

Current version no longer uses rotatef.

(setf base3 orig-base3)))
((eq 'low solarized-contrast)
(setf back base02
Expand Down Expand Up @@ -252,7 +252,7 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(,@fg-base1 ,@bg-base02 ,@fmt-revbb :box nil))
(mode-line-inactive ; StatusLineNC
(,@fg-base00 ,@bg-base02 ,@fmt-revbb :box nil))
(region (,@fg-base01 ,@bg-base03 ,@fmt-revbb)) ; Visual
(region (:background base02 :foreground nil :inverse-video nil))
Copy link
Owner

Choose a reason for hiding this comment

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

This comes directly from the Vim theme, so I’m not likely to change it. But soon I’ll merge something like #191 which would make it easy to define variations like this locally (while still being able to refer to base02, etc.).

(secondary-selection (,@bg-base02))
(shadow (,@fg-base01))
(trailing-whitespace (,@fmt-revr ,@fg-red))
Expand Down Expand Up @@ -468,8 +468,10 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(ace-jump-face-background (,@fmt-none ,@fg-base01))
(ace-jump-face-foreground (,@fmt-bold ,@fg-red))
;; bm visual bookmarks
(bm-fringe-face (,@bg-orange ,@fg-base03))
(bm-fringe-persistent-face (,@bg-blue ,@fg-base03))
(bm-face (,@bg-base02 nil))
(bm-persistent-face (,@bg-base02 nil))
(bm-fringe-face (,@bg-base01 nil))
(bm-fringe-persistent-face (,@bg-base01 nil))
;; Flymake
(flymake-errline (,@fmt-bold ,@fg-red)) ; Error
(flymake-warnline (,@fmt-bold ,@fg-red))
Expand Down Expand Up @@ -582,6 +584,7 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(helm-bookmark-man (,@fg-violet))
(helm-bookmark-w3m (,@fg-yellow))
(helm-bookmarks-su (,@fg-orange))
(helm-buffer-directory (:inherit helm-ff-directory))
Copy link
Owner

Choose a reason for hiding this comment

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

I’d be happy to take the changes from here down, if you want to update the PR.

(helm-buffer-not-saved (,@fg-orange))
(helm-buffer-process (,@fg-magenta))
(helm-buffer-saved-out (,@fmt-revr ,@fg-red ,@bg-back))
Expand All @@ -592,6 +595,7 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(helm-ff-directory (,@bg-back ,@fg-blue))
(helm-ff-executable (,@fmt-bold ,@fg-green))
(helm-ff-file (:inherit default))
(helm-ff-file-extension (,@fg-yellow))
(helm-ff-invalid-symlink (,@bg-base02 ,@fg-red))
(helm-ff-prefix (,@fmt-revr ,@fg-yellow))
(helm-ff-symlink (,@fmt-bold ,@fg-cyan))
Expand Down Expand Up @@ -621,11 +625,15 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(helm-selection (:inherit region))
(helm-selection-line (:inherit secondary-selection))
(helm-separator (,@fg-red))
(helm-source-header (:inherit helm-header))
(helm-source-header (,@fmt-bold ,@fg-cyan))
(helm-time-zone-current (,@fg-green))
(helm-time-zone-home (,@fg-red))
(helm-visible-mark (,@fmt-bold ,@bg-back ,@fg-magenta))
(helm-w3m-bookmarks (:inherit helm-bookmark-w3m))
(helm-swoop-target-line-face (:inherit region))
(helm-swoop-target-line-block-face (:inherit helm-match-item))
(helm-swoop-target-word-face (:inherit helm-match))
(helm-swoop-line-number-face (:inherit helm-grep-lineno))
;; markdown
(markdown-bold-face (:inherit bold))
(markdown-header-delimiter-face (:inherit shadow))
Expand Down Expand Up @@ -777,7 +785,44 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(undo-tree-visualizer-unmodified-face (,@fg-cyan))
(undo-tree-visualizer-register-face (,@fg-yellow))
;; haskell
(haskell-keyword-face (,@fg-cyan)))))))
(haskell-keyword-face (,@fg-cyan))
;; which-func
(which-func (,@bg-base02))
;; rbenv
(rbenv-active-ruby-face (,@bg-base02))
;; dired+
(diredp-compressed-file-suffix (,@fg-blue))
(diredp-date-time (,@fg-cyan))
(diredp-deletion (,@fg-red ,@fmt-bold :inverse-video t))
(diredp-deletion-file-name (:inherit highlight ,@fg-red))
(diredp-dir-name (:inherit dired-directory))
(diredp-dir-heading (:inherit dired-header ,@fmt-bold))
(diredp-dir-priv (,@fg-cyan :background nil))
(diredp-exec-priv (,@fg-blue :background nil))
(diredp-executable-tag (,@fg-red :background nil))
(diredp-file-name (:inherit default))
(diredp-file-suffix (,@fg-green))
(diredp-flag-mark (,@fg-green :inverse-video t))
(diredp-flag-mark-line (:background nil :inherit highlight ,@fmt-bold))
(diredp-ignored-file-name (:inherit dired-ignored))
(diredp-link-priv (,@fg-violet :background nil))
(diredp-mode-line-flagged (,@fg-red))
(diredp-mode-line-marked (,@fg-green))
(diredp-no-priv (:background nil))
(diredp-number (,@fg-yellow))
(diredp-other-priv (,@fg-magenta :background nil))
(diredp-rare-priv (,@fg-red :background nil))
(diredp-read-priv (,@fg-green :background nil))
(diredp-symlink (:inherit dired-symlink))
(diredp-write-priv (,@fg-yellow :background nil))
;; ein (emacs ipython notebook)
(ein:basecell-input-area-face (,@bg-back))
(ein:codecell-input-area-face (,@bg-back))
(ein:htmlcell-input-area-face (,@bg-back))
(ein:markdowncell-input-area-face (,@bg-back))
(ein:rawcell-input-area-face (,@bg-back))
(ein:cell-output-area (:inherit region))
(ein:cell-output-area-error (:inherit region)))))))

;;;###autoload
(when (boundp 'custom-theme-load-path)
Expand Down