emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move doom ui faces to doom-one-theme

Browse source
This commit is contained in:
Henrik Lissner 2016-05-23 17:14:37 -04:00
parent 56ac24887f
commit 986804bde2
1 changed files with 8 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
core/core-ui.el
View file

@ -73,17 +73,11 @@
(global-eldoc-mode -1)) (global-eldoc-mode -1))
;; Highlight TODO/FIXME/NOTE tags ;; Highlight TODO/FIXME/NOTE tags
(defface doom-todo-face '((t (:inherit font-lock-warning-face)))
"Face for TODOs")
(defface doom-fixme-face '((t (:inherit font-lock-warning-face)))
"Face for FIXMEs")
(defface doom-note-face '((t (:inherit font-lock-warning-face)))
"Face for NOTEs")
(add-hook! (prog-mode emacs-lisp-mode css-mode) (add-hook! (prog-mode emacs-lisp-mode css-mode)
(font-lock-add-keywords (font-lock-add-keywords
nil '(("\\<\\(TODO\\(?:(.*)\\)?:?\\)\\>" 1 'doom-todo-face prepend) nil '(("\\<\\(TODO\\(?:(.*)\\)?:?\\)\\>" 1 'warning prepend)
("\\<\\(FIXME\\(?:(.*)\\)?:?\\)\\>" 1 'doom-fixme-face prepend) ("\\<\\(FIXME\\(?:(.*)\\)?:?\\)\\>" 1 'error prepend)
("\\<\\(NOTE\\(?:(.*)\\)?:?\\)\\>" 1 'doom-note-face prepend)))) ("\\<\\(NOTE\\(?:(.*)\\)?:?\\)\\>" 1 'success prepend))))
;; Hide mode-line in help/compile window ;; Hide mode-line in help/compile window
(add-hook 'help-mode-hook 'doom|hide-mode-line) (add-hook 'help-mode-hook 'doom|hide-mode-line)
@ -155,10 +149,6 @@
(defvar nlinum-format "%4d ") (defvar nlinum-format "%4d ")
(defvar doom--hl-nlinum-overlay nil) (defvar doom--hl-nlinum-overlay nil)
(defvar doom--hl-nlinum-line nil) (defvar doom--hl-nlinum-line nil)
(defface doom-linum '((t (:inherit linum)))
"Face for line in popups")
(defface linum-highlight-face '((t (:inherit linum)))
"Face for line highlights")
:init :init
(add-hook! (add-hook!
(markdown-mode prog-mode scss-mode web-mode conf-mode) (markdown-mode prog-mode scss-mode web-mode conf-mode)
@ -337,22 +327,17 @@ anzu to be enabled."
;; line selection ;; line selection
((or (> lines 1) (eq 'line evil-visual-selection)) ((or (> lines 1) (eq 'line evil-visual-selection))
(if (and (eq evil-state 'visual) (eq evil-this-type 'line)) (if (and (eq evil-state 'visual) (eq evil-this-type 'line))
(format "%dL" lines) (format " %dL " lines)
(format " %dC %dL " chars lines))) (format " %dC %dL " chars lines)))
(t (format " %dC " (if evil chars (1- chars))))))) (t (format " %dC " (if evil chars (1- chars)))))))
highlight-face)) highlight-face))
:tight t) :tight t)
;; flycheck ;; flycheck
(defface spaceline-flycheck-error (defface doom-flycheck-error '((t (:inherit error)))
'((t (:foreground "#FC5C94" :distant-foreground "#A20C41")))
"Face for flycheck error feedback in the modeline.") "Face for flycheck error feedback in the modeline.")
(defface spaceline-flycheck-warning (defface doom-flycheck-warning '((t (:inherit warning)))
'((t (:foreground "#F3EA98" :distant-foreground "#968B26")))
"Face for flycheck warning feedback in the modeline.") "Face for flycheck warning feedback in the modeline.")
(defface spaceline-flycheck-info
'((t (:foreground "#8DE6F7" :distant-foreground "#21889B")))
"Face for flycheck info feedback in the modeline.")
(defvar-local doom--flycheck-err-cache nil "") (defvar-local doom--flycheck-err-cache nil "")
(defvar-local doom--flycheck-cache nil "") (defvar-local doom--flycheck-cache nil "")
@ -371,11 +356,11 @@ anzu to be enabled."
(concat (concat
(if fe (propertize (format " ⚠%s " fe) (if fe (propertize (format " ⚠%s " fe)
'face (if active 'face (if active
'spaceline-flycheck-error 'doom-flycheck-error
'mode-line))) 'mode-line)))
(if fw (propertize (format " ⚠%s " fw) (if fw (propertize (format " ⚠%s " fw)
'face (if active 'face (if active
'spaceline-flycheck-warning 'doom-flycheck-warning
'mode-line))))))))) 'mode-line)))))))))
:tight t) :tight t)