From a719298bc0471684904a56a5ee60819f01a8cda7 Mon Sep 17 00:00:00 2001 From: "Ian Y.E. Pan" Date: Thu, 21 May 2020 13:47:49 +0800 Subject: [PATCH] Massive refactor: Improvement for Magit, Ivy, Helm etc. --- tron-legacy-theme.el | 534 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 449 insertions(+), 85 deletions(-) diff --git a/tron-legacy-theme.el b/tron-legacy-theme.el index 488e0b4..09c79d2 100644 --- a/tron-legacy-theme.el +++ b/tron-legacy-theme.el @@ -1,90 +1,454 @@ -;;; tron-legacy-theme.el --- Custom Theme inspired by Tron: Legacy -;; -;; Copyright© 2018 Ian Y.E. Pan -;; Licensed under GNU GPLv3 -;; -;; This program is free software: you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. -;; -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. -;; -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . -;; -;; Author: Ian Y.E. Pan -;; +;;; tron-legacy-theme.el --- A complete port of the Tron Legacy theme for Emacs + +;; Copyright (C) 2018-2020 Ian Y.E. Pan + +;; Author: Ian Y.E. Pan + +;; This program is free software: you can redistribute it and/or modify +;; it under the tertron of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;; This file is not part of Emacs. + ;;; Commentary: -;; Apart from ``the Emacs scene'' in the 2010 Tron film, the colorscheme is -;; heavily inspired by Base16-BlackMetal, Doom, Grayscale and City Lights. -;; + ;;; Code: -(deftheme tron-legacy - "A theme by Ian Y.E. Pan. Licensed under GNU GPLv3.") - -(custom-theme-set-faces - `tron-legacy - `(default ((t (:background "#000000" :foreground "#6A8397" )))) - `(cursor ((t (:background "#b0ccdc")))) - `(region ((t (:background "#3E5668")))) - `(bold ((t (:weight normal :foreground "DarkGoldenrod2")))) - `(fringe ((t (:background "#000000")))) - `(mode-line ((t (:foreground "#CBECFF" :background "#3D5666")))) - `(mode-line-inactive ((t (:foreground "#444444" :background "#1e1e1e")))) - `(highlight ((t (:background "#262F36")))) - `(ido-first-match ((t (:foreground "#D7F0Ff" :weight bold)))) - `(ido-only-match ((t (:foreground "#31C0C0")))) - `(ido-subdir ((t (:foreground "#5DC4FF")))) - `(isearch ((t (:background "#4D4FBB" :foreground "#fffafa")))) - `(lazy-highlight ((t (:background "#659f93" :foreground "#fffafa")))) - `(linum ((t (:background "#000000" :foreground "#36424C")))) - `(nlinum-relative-current-face ((t (:inherit linum :background "#000000" :foreground "#c6c6c6" :weight normal)))) - `(font-lock-builtin-face ((t (:foreground "#5FC4FF")))) - `(font-lock-doc-face ((t (:foreground "#828D9C" :italic t)))) - `(font-lock-comment-face ((t (:foreground "#B0CCDC" :background nil :italic t)))) - `(font-lock-string-face ((t (:foreground "#387AAA")))) - `(font-lock-variable-name-face ((t (:foreground "#9BBDD6")))) - `(font-lock-function-name-face ((t (:foreground "#4BB5BE")))) - `(font-lock-keyword-face ((t (:foreground "#5EC4FF")))) - `(font-lock-negation-char-face ((t (:foreground "#5EC4FF")))) - `(font-lock-preprocessor-face ((t (:foreground "#5EC4FF")))) - `(font-lock-type-face ((t (:foreground"#DEB45B")))) - `(font-lock-constant-face ((t (:foreground "#B62D66")))) - `(minibuffer-prompt ((t (:foreground "#729fcf" )))) - `(font-lock-warning-face ((t (:foreground "red" :bold t)))) - `(org-block ((t (:background "#20282F" :foreground "#839DB2")))) - `(org-document-title ((t (:height 1.5 :foreground "#9bbdd6")))) - `(org-level-1 ((t (:inherit outline-1 :weight bold :foreground "#94DCFE" :height 1.3)))) - `(org-level-2 ((t (:inherit outline-2 :weight bold :foreground "#80E3E2" :height 1.1)))) - `(org-level-3 ((t (:inherit outline-3 :weight bold :foreground "#528BD1" :height 1.1)))) - `(org-table ((t (:background "#002831" :foreground "#9bbdd6")))) - `(rainbow-delimiters-depth-1-face ((t (:foreground "#80E3E2")))) - `(rainbow-delimiters-depth-2-face ((t (:foreground "#6BB9FE")))) - `(rainbow-delimiters-depth-3-face ((t (:foreground "#B5DEFF")))) - `(rainbow-delimiters-depth-4-face ((t (:foreground "#80E3E2")))) - `(rainbow-delimiters-depth-5-face ((t (:foreground "#6BB9FE")))) - `(rainbow-delimiters-depth-6-face ((t (:foreground "#B5DEFF")))) - `(rainbow-delimiters-depth-7-face ((t (:foreground "#80E3E2")))) - `(rainbow-delimiters-depth-8-face ((t (:foreground "#6BB9FE")))) - `(rainbow-delimiters-depth-9-face ((t (:foreground "#B5DEFF")))) - `(company-preview-common ((t (:foreground unspecified :background "#111111")))) - `(company-scrollbar-bg ((t (:background "#111111")))) - `(company-scrollbar-fg ((t (:background "#6a7488")))) - `(company-tooltip ((t (:inherit default :background "#111111")))) - `(company-tooltip-common ((t (:inherit font-lock-constant-face)))) - `(company-tooltip-selection ((t (:inherit font-lock-keyword-face :background "#25272c" )))) - `(centaur-tabs-selected ((t (:background "#111111" :foreground "#eef6ff" :box nil)))) - `(centaur-tabs-unselected ((t (:background "black" :foreground "#8899aa" :box nil)))) - `(centaur-tabs-selected-modified ((t (:background "#111111" :foreground ,"#CAECFE" :box nil)))) - `(centaur-tabs-unselected-modified ((t (:background "black" :foreground "#8899aa" :box nil)))) - `(centaur-tabs-active-bar-face ((t (:background "#cafcff" :box nil)))) - `(centaur-tabs-modified-marker-selected ((t (:inherit 'centaur-tabs-selected-modified :foreground "#cafcff" :box nil)))) - `(centaur-tabs-modified-marker-unselected ((t (:inherit 'centaur-tabs-unselected-modified :foreground "#cafcff" :box nil)))) - ) + +(deftheme tron-legacy) +(let ((class '((class color) (min-colors 89))) + (fg0 "#5A7387") + (fg1 "#B0CCDC") ; default fg + (fg2 "#8BaCbF") + (fg3 "#bBECeF") + (fg4 "#CBECFF") + (bg00 "#000000") + (bg0 "#000000") + (bg1 "#000000") ; default bg + (bg2 "#021222") + (bg3 "#213141") + (bg4 "#2b4255") + (bg-hl "#1b3245") ; region, selection + (tw-r "#B62D66") + (tw-g "#2Ba57E") + (tw-b "#3F94aF") + (key2 "#9BBDD6") + (key3 "#aaaaaa") + (accent "#ffffff") + (mode-line-bg "#3D5666") + (mode-line-bg-dark "#1e1e1e") + (line-num "#5A7387") + (builtin "#8Fd4FF") + (keyword "#8Fd4FF") + (const "#B62D66") + (comment "#5a7387") + (doc "#6a8397") + (type "#4BB5BE") + (str "#387AAA") + (func "#DEB45B") + (var "#9BBDD6") + (warning "#880000") + + ;; standardized palette + (tron-yellow "#DEB45B") + (tron-bluegreen "#4BB5BE") + (tron-magenta "#B62D66") + (tron-lightblue "#B0CCDC") + (tron-orange "#DEB45B") + (tron-red "#B62D66") + (tron-blue "#5EC4FF") + (tron-lightgreen "#B0CCDC") + (tron-green "#4BB5BE") + ) + (custom-theme-set-faces + 'tron-legacy + `(default ((,class (:background ,bg1 :foreground ,fg1)))) + + `(font-lock-builtin-face ((,class (:foreground ,builtin)))) + `(font-lock-comment-face ((,class (:foreground ,comment :italic t)))) + `(font-lock-negation-char-face ((,class (:foreground ,const)))) + `(font-lock-reference-face ((,class (:foreground ,const)))) + `(font-lock-constant-face ((,class (:foreground ,const)))) + `(font-lock-doc-face ((,class (:foreground ,doc)))) + `(font-lock-function-name-face ((,class (:foreground ,func :bold nil)))) + `(font-lock-keyword-face ((,class (:bold nil :foreground ,keyword)))) + `(font-lock-string-face ((,class (:foreground ,str)))) + `(font-lock-type-face ((,class (:foreground ,type )))) + `(font-lock-variable-name-face ((,class (:foreground ,var)))) + `(font-lock-warning-face ((,class (:foreground ,warning :background ,bg2)))) + + `(region ((,class (:background ,bg-hl :distant-foreground ,fg2)))) + `(highlight ((,class (:foreground ,bg3 :background ,fg3)))) + `(hl-line ((,class (:background "#0E2638")))) + `(fringe ((,class (:background ,bg1 :foreground ,fg4)))) + `(cursor ((,class (:background ,fg1)))) + `(show-paren-match-face ((,class (:background ,warning)))) + `(show-paren-match ((t (:foreground ,accent :background ,bg4 :bold t)))) + `(show-paren-mismatch ((t (:background ,warning)))) + `(isearch ((,class (:bold nil :foreground ,accent :background ,bg4)))) + `(vertical-border ((,class (:foreground ,bg3)))) + `(minibuffer-prompt ((,class (:foreground ,tron-bluegreen :weight normal)))) + `(default-italic ((,class (:italic t)))) + `(link ((,class (:foreground ,const :underline t)))) + `(error ((,class (:foreground ,tron-orange)))) + `(warning ((,class (:foreground ,tron-magenta)))) + `(success ((,class (:foreground ,tron-bluegreen)))) + `(dired-directory ((t (:inherit (font-lock-keyword-face))))) + `(line-number ((,class (:foreground ,line-num :background nil)))) + `(line-number-current-line ((,class (:foreground ,fg1 :background nil)))) + + `(mode-line ((,class (:bold nil :foreground ,fg3 :background ,mode-line-bg)))) + `(mode-line-inactive ((,class (:bold nil :foreground ,fg1 :background ,mode-line-bg-dark)))) + `(mode-line-buffer-id ((,class (:bold nil :foreground ,fg3 :background nil)))) + `(mode-line-highlight ((,class (:foreground ,keyword :box nil :weight normal)))) + `(mode-line-emphasis ((,class (:foreground ,fg1)))) + + `(company-preview-common ((t (:foreground unspecified :background ,bg2)))) + `(company-scrollbar-bg ((t (:background ,bg2)))) + `(company-scrollbar-fg ((t (:background ,bg3)))) + `(company-tooltip ((t (:inherit default :background ,bg2)))) + `(company-tooltip-common ((t (:foreground ,tron-blue :bold t)))) + `(company-tooltip-selection ((t (:background ,bg-hl)))) + `(company-tooltip-annotation ((t (:foreground ,doc)))) ; parameter hints etc. + + `(org-document-title ((,class (:foreground ,type :height 1.2 :bold t)))) + `(org-level-1 ((,class (:bold nil :foreground ,tron-bluegreen :height 1.1)))) + `(org-level-2 ((,class (:bold nil :foreground ,tron-lightblue)))) + `(org-level-3 ((,class (:bold nil :foreground ,tron-blue)))) + `(org-level-4 ((,class (:bold nil :foreground ,tron-bluegreen)))) + `(org-code ((,class (:foreground ,fg2)))) + `(org-hide ((,class (:foreground ,fg4)))) + `(org-date ((,class (:underline t :foreground ,var) ))) + `(org-footnote ((,class (:underline t :foreground ,fg4)))) + `(org-link ((,class (:underline t :foreground ,type )))) + `(org-special-keyword ((,class (:foreground ,tron-green)))) + `(org-block ((,class (:foreground ,fg2 :background ,bg0 :extend t)))) + `(org-quote ((,class (:inherit org-block :slant italic)))) + `(org-verse ((,class (:inherit org-block :slant italic)))) + `(org-todo ((,class (:box (:line-width 1 :color ,fg3) :foreground ,keyword :bold nil)))) + `(org-done ((,class (:box (:line-width 1 :color ,bg3) :bold nil :foreground ,bg4)))) + `(org-warning ((,class (:underline t :foreground ,warning)))) + `(org-agenda-structure ((,class (:weight normal :foreground ,fg3 :box (:color ,fg4) :background ,bg3)))) + `(org-agenda-date ((,class (:foreground ,var :height 1.1 )))) + `(org-agenda-date-weekend ((,class (:weight normal :foreground ,fg4)))) + `(org-agenda-date-today ((,class (:weight normal :foreground ,keyword :height 1.2)))) + `(org-agenda-done ((,class (:foreground ,bg4)))) + `(org-scheduled ((,class (:foreground ,type)))) + `(org-scheduled-today ((,class (:foreground ,func :weight normal :height 1.2)))) + `(org-ellipsis ((,class (:foreground ,builtin)))) + `(org-verbatim ((,class (:foreground ,fg4)))) + `(org-document-info-keyword ((,class (:foreground ,tron-green)))) + `(org-sexp-date ((,class (:foreground ,fg4)))) + + `(font-latex-bold-face ((,class (:foreground ,type)))) + `(font-latex-italic-face ((,class (:foreground ,key3 :italic t)))) + `(font-latex-string-face ((,class (:foreground ,str)))) + `(font-latex-match-reference-keywords ((,class (:foreground ,const)))) + `(font-latex-match-variable-keywords ((,class (:foreground ,var)))) + + `(ido-only-match ((,class (:foreground ,keyword)))) + `(ido-subdir ((,class (:weight normal :foreground ,fg0)))) + `(ido-first-match ((,class (:foreground ,keyword :bold nil)))) + + `(gnus-header-content ((,class (:foreground ,keyword)))) + `(gnus-header-from ((,class (:foreground ,var)))) + `(gnus-header-name ((,class (:foreground ,type)))) + `(gnus-header-subject ((,class (:foreground ,func :bold nil)))) + + `(mu4e-view-url-number-face ((,class (:foreground ,type)))) + `(mu4e-cited-1-face ((,class (:foreground ,fg2)))) + `(mu4e-cited-7-face ((,class (:foreground ,fg3)))) + `(mu4e-header-marks-face ((,class (:foreground ,type)))) + + `(ffap ((,class (:foreground ,fg4)))) + + `(js2-private-function-call ((,class (:foreground ,const)))) + `(js2-jsdoc-html-tag-delimiter ((,class (:foreground ,str)))) + `(js2-jsdoc-html-tag-name ((,class (:foreground ,key2)))) + `(js2-external-variable ((,class (:foreground ,type )))) + `(js2-function-param ((,class (:foreground ,const)))) + `(js2-jsdoc-value ((,class (:foreground ,str)))) + `(js2-private-member ((,class (:foreground ,fg3)))) + `(js2-warning ((t (:underline ,warning)))) + `(js2-error ((t (:foreground ,warning :weight normal)))) + `(js2-jsdoc-tag ((t (:foreground ,var)))) + `(js2-jsdoc-type ((t (:foreground ,var)))) + `(js2-instance-member ((t (:foreground ,var)))) + `(js2-object-property ((t (:foreground ,func)))) + `(js2-magic-paren ((t (:foreground ,const)))) + `(js2-function-call ((t (:foreground ,const)))) + `(js2-keywords ((t (:foreground ,keyword)))) + `(js3-warning-face ((,class (:underline ,keyword)))) + `(js3-error-face ((,class (:underline ,warning)))) + `(js3-external-variable-face ((,class (:foreground ,var)))) + `(js3-function-param-face ((,class (:foreground ,key3)))) + `(js3-jsdoc-tag-face ((,class (:foreground ,keyword)))) + `(js3-instance-member-face ((,class (:foreground ,const)))) + + `(ac-completion-face ((,class (:underline t :foreground ,keyword)))) + `(info-quoted-name ((,class (:foreground ,builtin)))) + `(info-string ((,class (:foreground ,str)))) + `(icompletep-determined ((,class :foreground ,builtin))) + + `(slime-repl-inputed-output-face ((,class (:foreground ,type)))) + `(trailing-whitespace ((,class :foreground nil :background ,warning))) + `(lazy-highlight ((,class (:foreground ,fg2 :background ,bg3)))) + + `(undo-tree-visualizer-current-face ((,class :foreground ,builtin))) + `(undo-tree-visualizer-default-face ((,class :foreground ,fg2))) + `(undo-tree-visualizer-unmodified-face ((,class :foreground ,var))) + `(undo-tree-visualizer-register-face ((,class :foreground ,type))) + + `(rainbow-delimiters-depth-1-face ((,class :foreground "gold"))) + `(rainbow-delimiters-depth-2-face ((,class :foreground "orchid"))) + `(rainbow-delimiters-depth-3-face ((,class :foreground "LightSkyBlue"))) + `(rainbow-delimiters-depth-4-face ((,class :foreground "gold"))) + `(rainbow-delimiters-depth-5-face ((,class :foreground "orchid"))) + `(rainbow-delimiters-depth-6-face ((,class :foreground "LightSkyBlue"))) + `(rainbow-delimiters-depth-7-face ((,class :foreground "gold"))) + `(rainbow-delimiters-depth-8-face ((,class :foreground "orchid"))) + `(rainbow-delimiters-depth-9-face ((,class :foreground "LightSkyBlue"))) + `(rainbow-delimiters-unmatched-face ((,class :foreground ,warning))) + + ;;;;; Old magit faces + ;; `(magit-item-highlight ((,class :background ,bg3))) + ;; `(magit-section-heading ((,class (:foreground ,keyword :weight normal)))) + ;; `(magit-hunk-heading ((,class (:background ,bg3)))) + ;; `(magit-section-highlight ((,class (:background ,bg3)))) + ;; `(magit-hunk-heading-highlight ((,class (:background ,bg3)))) + ;; `(magit-diff-context-highlight ((,class (:background ,bg3 :foreground ,fg3)))) + ;; `(magit-diffstat-added ((,class (:foreground ,type)))) + ;; `(magit-diffstat-removed ((,class (:foreground ,var)))) + ;; `(magit-process-ok ((,class (:foreground ,func :weight normal)))) + ;; `(magit-process-ng ((,class (:foreground ,warning :weight normal)))) + ;; `(magit-branch ((,class (:foreground ,const :weight normal)))) + ;; `(magit-log-author ((,class (:foreground ,fg3)))) + ;; `(magit-hash ((,class (:foreground ,fg2)))) + ;; `(magit-diff-file-header ((,class (:foreground ,fg2 :background ,bg3)))) + + ;;;;; New magit faces (adpated from sanityinc-tomorrow themes) + `(magit-item-highlight ((,class :background ,bg3))) + `(magit-hunk-heading ((,class (:background ,bg3)))) + `(magit-hunk-heading-highlight ((,class (:background ,bg3)))) + `(magit-bisect-bad ((t (:foreground ,tron-red)))) + `(magit-bisect-good ((t (:foreground ,tron-green)))) + `(magit-bisect-skip ((t (:foreground ,tron-orange)))) + `(magit-blame-date ((t (:foreground ,tron-red)))) + `(magit-blame-heading ((t (:foreground ,tron-orange :background ,bg3 :extend t)))) + `(magit-branch ((,class (:foreground ,tron-blue :weight normal)))) + `(magit-branch-current ((t (:foreground ,tron-blue)))) + `(magit-branch-local ((t (:foreground ,tron-bluegreen)))) + `(magit-branch-remote ((t (:foreground ,tron-green)))) + `(magit-cherry-equivalent ((t (:foreground ,tron-magenta)))) + `(magit-cherry-unmatched ((t (:foreground ,tron-bluegreen)))) + ;; `(magit-diff-added ((t (:foreground ,tron-green :extend t)))) + ;; `(magit-diff-added-highlight ((t (:foreground ,tron-green :background ,bg3 :extend t)))) + ;; `(magit-diff-base ((t (:foreground ,bg1 :background ,tron-orange :extend t)))) + ;; `(magit-diff-base-highlight ((t (:foreground ,tron-orange :background ,bg3 :extend t)))) + ;; `(magit-diff-context ((t (:foreground ,comment :extend t)))) + ;; `(magit-diff-file-header ((,class (:foreground ,fg2 :background ,bg3)))) + ;; `(magit-diff-file-heading ((t (:foreground ,fg1 :extend t)))) + ;; `(magit-diff-file-heading-highlight ((t (:background ,bg3 :extend t)))) + ;; `(magit-diff-file-heading-selection ((t (:foreground ,tron-orange :background ,bg3 :extend t)))) + ;; `(magit-diff-hunk-heading ((t (:foreground ,fg1 :background ,bg3 :extend t)))) + ;; `(magit-diff-hunk-heading-highlight ((t (:background ,bg3 :extend t)))) + ;; `(magit-diff-lines-heading ((t (:foreground ,tron-yellow :background ,tron-red :extend t)))) + ;; `(magit-diff-removed ((t (:foreground ,tron-orange :extend t)))) + ;; `(magit-diff-removed-highlight ((t (:foreground ,tron-orange :background ,bg3 :extend t)))) + `(magit-diff-context-highlight ((,class (:background ,bg3 :foreground ,fg3)))) + `(magit-diffstat-added ((t (:foreground ,tron-green)))) + `(magit-diffstat-removed ((t (:foreground ,tron-orange)))) + `(magit-dimmed ((t (:foreground ,comment)))) + `(magit-filename ((t (:foreground ,tron-magenta)))) + `(magit-hash ((t (:foreground ,comment)))) + `(magit-header-line ((t (:inherit nil)))) + `(magit-log-author ((t (:foreground ,tron-orange)))) + `(magit-log-date ((t (:foreground ,tron-blue)))) + `(magit-log-graph ((t (:foreground ,comment)))) + `(magit-mode-line-process ((t (:foreground ,tron-orange)))) + `(magit-mode-line-process-error ((t (:foreground ,tron-red)))) + `(magit-process-ok ((t (:inherit success)))) + `(magit-process-ng ((t (:inherit error)))) + `(magit-reflog-amend ((t (:foreground ,tron-magenta)))) + `(magit-reflog-checkout ((t (:foreground ,tron-blue)))) + `(magit-reflog-cherry-pick ((t (:foreground ,tron-green)))) + `(magit-reflog-commit ((t (:foreground ,tron-green)))) + `(magit-reflog-merge ((t (:foreground ,tron-green)))) + `(magit-reflog-other ((t (:foreground ,tron-bluegreen)))) + `(magit-reflog-rebase ((t (:foreground ,tron-magenta)))) + `(magit-reflog-remote ((t (:foreground ,tron-bluegreen)))) + `(magit-reflog-reset ((t (:inherit error)))) + `(magit-refname ((t (:foreground ,comment)))) + `(magit-section-heading ((t (:foreground ,tron-yellow)))) + `(magit-section-heading-selection ((t (:foreground ,tron-orange :extend t)))) + `(magit-section-highlight ((t (:background ,bg3 :extend t)))) + `(magit-sequence-drop ((t (:foreground ,tron-red)))) + `(magit-sequence-head ((t (:foreground ,tron-blue)))) + `(magit-sequence-part ((t (:foreground ,tron-orange)))) + `(magit-sequence-stop ((t (:foreground ,tron-green)))) + `(magit-signature-bad ((t (:inherit error)))) + `(magit-signature-error ((t (:inherit error)))) + `(magit-signature-expitron-red ((t (:foreground ,tron-orange)))) + `(magit-signature-good ((t (:inherit success)))) + `(magit-signature-revoked ((t (:foreground ,tron-magenta)))) + `(magit-signature-untrusted ((t (:foreground ,tron-bluegreen)))) + `(magit-tag ((t (:foreground ,tron-yellow)))) + + `(term ((,class (:foreground ,fg1 :background ,bg1)))) + `(term-color-black ((,class (:foreground ,bg3 :background ,bg3)))) + `(term-color-blue ((,class (:foreground ,func :background ,func)))) + `(term-color-red ((,class (:foreground ,keyword :background ,bg3)))) + `(term-color-green ((,class (:foreground ,type :background ,bg3)))) + `(term-color-yellow ((,class (:foreground ,var :background ,var)))) + `(term-color-magenta ((,class (:foreground ,builtin :background ,builtin)))) + `(term-color-cyan ((,class (:foreground ,str :background ,str)))) + `(term-color-white ((,class (:foreground ,fg2 :background ,fg2)))) + + `(helm-header ((,class (:foreground ,fg2 :background ,bg1 :underline nil :box nil)))) + `(helm-source-header ((,class (:foreground ,keyword :background ,bg1 :underline nil :weight normal)))) + `(helm-selection ((,class (:background ,bg2 :underline nil)))) + `(helm-selection-line ((,class (:background ,bg2)))) + `(helm-visible-mark ((,class (:foreground ,bg1 :background ,bg3)))) + `(helm-candidate-number ((,class (:foreground ,bg1 :background ,fg1)))) + `(helm-separator ((,class (:foreground ,type :background ,bg1)))) + `(helm-time-zone-current ((,class (:foreground ,builtin :background ,bg1)))) + `(helm-time-zone-home ((,class (:foreground ,type :background ,bg1)))) + `(helm-buffer-not-saved ((,class (:foreground ,type :background ,bg1)))) + `(helm-buffer-process ((,class (:foreground ,builtin :background ,bg1)))) + `(helm-buffer-saved-out ((,class (:foreground ,fg1 :background ,bg1)))) + `(helm-buffer-size ((,class (:foreground ,fg1 :background ,bg1)))) + `(helm-ff-directory ((,class (:foreground ,func :background ,bg1 :weight normal)))) + `(helm-ff-file ((,class (:foreground ,fg1 :background ,bg1 :weight normal)))) + `(helm-ff-executable ((,class (:foreground ,key2 :background ,bg1 :weight normal)))) + `(helm-ff-invalid-symlink ((,class (:foreground ,key3 :background ,bg1 :weight normal)))) + `(helm-ff-symlink ((,class (:foreground ,keyword :background ,bg1 :weight normal)))) + `(helm-ff-prefix ((,class (:foreground ,bg1 :background ,keyword :weight normal)))) + `(helm-grep-cmd-line ((,class (:foreground ,fg1 :background ,bg1)))) + `(helm-grep-file ((,class (:foreground ,fg1 :background ,bg1)))) + `(helm-grep-finish ((,class (:foreground ,fg2 :background ,bg1)))) + `(helm-grep-lineno ((,class (:foreground ,fg1 :background ,bg1)))) + `(helm-grep-match ((,class (:foreground nil :background nil :inherit helm-match)))) + `(helm-grep-running ((,class (:foreground ,func :background ,bg1)))) + `(helm-moccur-buffer ((,class (:foreground ,func :background ,bg1)))) + `(helm-source-go-package-godoc-description ((,class (:foreground ,str)))) + `(helm-bookmark-w3m ((,class (:foreground ,type)))) + + `(web-mode-html-bracket-face ((,class (:foreground "#808080")))) + `(web-mode-html-tag-face ((,class (:foreground ,keyword)))) + `(web-mode-html-attr-name-face ((,class (:foreground ,var)))) + `(web-mode-html-attr-value-face ((,class (:foreground ,str)))) + `(web-mode-builtin-face ((,class (:inherit ,font-lock-builtin-face)))) + `(web-mode-comment-face ((,class (:inherit ,font-lock-comment-face)))) + `(web-mode-constant-face ((,class (:inherit ,font-lock-constant-face)))) + `(web-mode-keyword-face ((,class (:foreground ,keyword)))) + `(web-mode-doctype-face ((,class (:inherit ,font-lock-doc-face)))) + `(web-mode-function-name-face ((,class (:inherit ,font-lock-function-name-face)))) + `(web-mode-string-face ((,class (:foreground ,str)))) + `(web-mode-type-face ((,class (:inherit ,font-lock-type-face)))) + `(web-mode-warning-face ((,class (:inherit ,font-lock-warning-face)))) + + `(ediff-fine-diff-Ancestor ((t (:background "#885555")))) + `(ediff-fine-diff-A ((t (:background "#885555")))) + `(ediff-fine-diff-B ((t (:background "#558855")))) + `(ediff-fine-diff-C ((t (:background "#555588")))) + `(ediff-current-diff-Ancestor ((t (:background "#663333")))) + `(ediff-current-diff-A ((t (:background "#663333")))) + `(ediff-current-diff-B ((t (:background "#336633")))) + `(ediff-current-diff-C ((t (:background "#333366")))) + `(ediff-even-diff-Ancestor ((t (:background ,bg3)))) + `(ediff-even-diff-A ((t (:background ,bg3)))) + `(ediff-even-diff-B ((t (:background ,bg3)))) + `(ediff-even-diff-C ((t (:background ,bg3)))) + `(ediff-odd-diff-Ancestor ((t (:background ,bg3)))) + `(ediff-odd-diff-A ((t (:background ,bg3)))) + `(ediff-odd-diff-B ((t (:background ,bg3)))) + `(ediff-odd-diff-C ((t (:background ,bg3)))) + + `(jde-java-font-lock-package-face ((t (:foreground ,var)))) + `(jde-java-font-lock-public-face ((t (:foreground ,keyword)))) + `(jde-java-font-lock-private-face ((t (:foreground ,keyword)))) + `(jde-java-font-lock-constant-face ((t (:foreground ,const)))) + `(jde-java-font-lock-modifier-face ((t (:foreground ,key3)))) + `(jde-jave-font-lock-protected-face ((t (:foreground ,keyword)))) + `(jde-java-font-lock-number-face ((t (:foreground ,var)))) + + `(centaur-tabs-default ((t (:background ,bg1 :foreground ,fg1)))) + `(centaur-tabs-selected ((t (:background ,bg1 :foreground ,fg3 :box nil)))) + `(centaur-tabs-unselected ((t (:background ,bg2 :foreground ,fg0 :box nil)))) + `(centaur-tabs-selected-modified ((t (:background ,bg2 :foreground ,accent :box nil)))) + `(centaur-tabs-unselected-modified ((t (:background ,bg2 :foreground ,fg4 :box nil)))) + `(centaur-tabs-active-bar-face ((t (:background ,accent :box nil)))) + `(centaur-tabs-modified-marker-selected ((t (:inherit 'centaur-tabs-selected-modified :foreground ,accent :box nil)))) + `(centaur-tabs-modified-marker-unselected ((t (:inherit 'centaur-tabs-unselected-modified :foreground ,accent :box nil)))) + + `(solaire-default-face ((t (:inherit default :background ,bg2)))) + `(solaire-minibuffer-face ((t (:inherit default :background ,bg2)))) + `(solaire-hl-line-face ((t (:inherit hl-line :background ,bg3)))) + `(solaire-org-hide-face ((t (:inherit org-hide :background ,bg2)))) + + + `(ivy-confirm-face ((t (:inherit minibuffer-prompt :foreground ,keyword)))) + `(ivy-current-match ((t (:background ,bg-hl :extend t)))) + `(ivy-highlight-face ((t (:inherit font-lock-builtin-face)))) + `(ivy-match-required-face ((t (:inherit minibuffer-prompt :foreground ,warning)))) + `(ivy-minibuffer-match-face-1 ((t (:inherit isearch)))) + `(ivy-minibuffer-match-face-2 ((t (:inherit ivy-minibuffer-match-face-1)))) + `(ivy-minibuffer-match-face-3 ((t (:inherit ivy-minibuffer-match-face-2)))) + `(ivy-minibuffer-match-face-4 ((t (:inherit ivy-minibuffer-match-face-2)))) + `(ivy-minibuffer-match-highlight ((t (:inherit ivy-current-match)))) + `(ivy-modified-buffer ((t (:inherit default :foreground ,var)))) + `(ivy-virtual ((t (:inherit default :foreground ,doc)))) + `(ivy-posframe ((t (:background "#252526")))) + + `(counsel-key-binding ((t (:foreground ,var)))) + + `(swiper-match-face-1 ((t (:inherit ivy-minibuffer-match-face-1)))) + `(swiper-match-face-2 ((t (:inherit ivy-minibuffer-match-face-2)))) + `(swiper-match-face-3 ((t (:inherit ivy-minibuffer-match-face-3)))) + `(swiper-match-face-4 ((t (:inherit ivy-minibuffer-match-face-4)))) + `(swiper-line-face ((t (:foreground ,fg0 :background ,bg4 :extend t)))) + + `(git-gutter:added ((t (:background ,tw-g :foreground ,tw-g :weight normal)))) + `(git-gutter:deleted ((t (:background ,tw-r :foreground ,tw-r :weight normal)))) + `(git-gutter:modified ((t (:background ,tw-b :foreground ,tw-b :weight normal)))) + `(git-gutter-fr:added ((t (:background ,tw-g :foreground ,tw-g :weight normal)))) + `(git-gutter-fr:deleted ((t (:background ,tw-r :foreground ,tw-r :weight normal)))) + `(git-gutter-fr:modified ((t (:background ,tw-b :foreground ,tw-b :weight normal)))) + + `(diff-hl-insert ((t (:background ,tw-g :foreground ,tw-g)))) + `(diff-hl-delete ((t (:background ,tw-r :foreground ,tw-r)))) + `(diff-hl-change ((t (:background ,tw-b :foreground ,tw-b)))) + + `(neo-dir-link-face ((t (:foreground "#cccccc" :family "Sans Serif")))) + `(neo-header-face ((t (:foreground "#cccccc" :family "Sans Serif")))) + `(neo-banner-face ((t (:foreground "#cccccc" :family "Sans Serif")))) + `(neo-root-dir-face ((t (:foreground "#cccccc" :family "Sans Serif")))) + `(neo-file-link-face ((t (:foreground "#aaaaaa" :family "Sans Serif")))) + `(neo-expand-btn-face ((t (:foreground "#aaaaaa")))) + + `(sml/global ((t (:foreground ,fg1 :weight normal)))) + `(sml/filename ((t (:foreground ,fg1 :weight normal)))) + `(sml/prefix ((t (:foreground ,fg1 :weight normal)))) + `(sml/read-only ((t (:foreground ,fg1 :weight normal)))) + `(sml/modes ((t (:foreground ,fg1 :weight normal)))) + + `(evil-ex-substitute-matches ((t (:foreground ,warning :weight normal :strike-through t)))) + `(evil-ex-substitute-replacement ((t (:foreground ,tron-bluegreen :weight normal)))) + + `(hl-todo ((t (:inverse-video t)))) + `(highlight-numbers-number ((t (:foreground ,tron-red)))) + `(highlight-operators-face ((t (:inherit default)))) + `(highlight-symbol-face ((t (:background "#343a40")))) + )) (provide-theme 'tron-legacy) + ;;; tron-legacy-theme.el ends here