提交: c5937f0479530d9256e8cd799a9d840750f88093 - emacs (git)

Commit MetaInfo

• 修订版: c5937f0479530d9256e8cd799a9d840750f88093 (tree)
• 时间: 2023-05-03 20:32:44
• 作者: badcoff33 <none@none>
• Commiter: badcoff33

Log Message

color of the day

更改概述

• modified: themes/multi-color-theme.el
• modified: themes/two-tone-theme.el

差异

--- a/themes/multi-color-theme.el
+++ b/themes/multi-color-theme.el
@@ -124,7 +124,7 @@
    `(compilation-error ((t (:foreground ,red-3))))
    `(compilation-info ((t (:foreground ,red-4))))
    `(compilation-line-number ((t (:foreground ,red-6))))
-   `(cursor ((t (:distant-foreground ,black :foreground ,black :background ,purple-6))))
+   `(cursor ((t (:distant-foreground ,black :foreground ,black :background ,blue-4))))
    `(default ((,class (:background ,white :foreground ,gray-1))))
    `(eshell-ls-directory ((t (:inherit dired-directory))))
    `(eshell-prompt ((t (:inherit minibuffer-prompt))))
@@ -138,10 +138,10 @@
    `(linum ((t (:foreground ,red-7))))
    `(match ((t (:foreground ,orange-0 :background ,orange-8 ))))
    `(minibuffer-prompt ((t (:foreground ,blue-4 :weight normal))))
-   `(mode-line ((t (:foreground ,purple-9 :background ,purple-1 :box (:line-width 1 :color ,purple-2 :style nil)))))
-   `(mode-line-highlight ((t (:foreground ,white :background ,purple-2 :box (:line-width 1 :color ,pink-2 :style nil)))))
+   `(mode-line ((t (:foreground ,pink-9 :background ,pink-1 :box (:line-width 2 :color ,pink-1 :style nil)))))
+   `(mode-line-highlight ((t (:foreground ,white :background ,purple-2 :box (:line-width 2 :color ,pink-2 :style nil)))))
    `(mode-line-buffer-id ((t (:foreground ,orange-7 :distant-foreground ,black :weight bold))))
-   `(mode-line-inactive ((t (:foreground ,gray-5 :background ,white :box (:line-width 1 :color ,gray-5 :style nil)))))
+   `(mode-line-inactive ((t (:foreground ,gray-4 :background ,gray-7 :box (:line-width 2 :color ,gray-8 :style nil)))))
    `(region ((t (:foreground ,blue-0 :background ,blue-8))))
    `(sh-quoted-exec ((t (:foreground ,white :slant italic))))
    `(shadow ((,class (:foreground ,gray-3 :background ,gray-9 :slant italic))))

--- a/themes/two-tone-theme.el
+++ b/themes/two-tone-theme.el
@@ -19,8 +19,7 @@
 
 ;;; Commentary:
 ;; Keep things reduced. Only some bright colors to highlight important
-;; stuff: Blue and red and some silver-ish colors are more than enough
-
+;; stuff: Blue and red and some gray-ish colors are more than enough
 
 ;;; Code:
 
@@ -37,16 +36,16 @@
        (red     "#EF2372")
        (red-bg  "#FFC8C8")
 
-       (silver-9 "#F5F5F8")
-       (silver-8 "#E1E1E5")
-       (silver-7 "#D1D1D4")
-       (silver-6 "#B5B5B9")
-       (silver-5 "#959598")
-       (silver-4 "#78787A")
-       (silver-3 "#58585A")
-       (silver-2 "#444447")
-       (silver-1 "#333335")
-       (silver-0 "#252528"))
+       (gray-9 "#F5F5F8")
+       (gray-8 "#E1E1E5")
+       (gray-7 "#D1D1D4")
+       (gray-6 "#B5B5B9")
+       (gray-5 "#959598")
+       (gray-4 "#78787A")
+       (gray-3 "#58585A")
+       (gray-2 "#444447")
+       (gray-1 "#333335")
+       (gray-0 "#252528"))
 
   (custom-theme-set-faces
    'two-tone
@@ -54,68 +53,68 @@
    ;; basics
 
    `(comint-highlight-prompt ((t (:foreground ,blue))))
-   `(compilation-column-number ((t (:foreground ,silver-6))))
+   `(compilation-column-number ((t (:foreground ,gray-6))))
    `(compilation-error ((t (:foreground ,red))))
    `(compilation-info ((t (:foreground ,blue))))
    `(compilation-line-number ((t (:foreground ,blue :weight bold))))
-   `(cursor ((t (:background ,blue :foreground ,white))))
-   `(default ((,class (:background ,white :foreground ,silver-0))))
+   `(cursor ((t (:background ,black :foreground ,white))))
+   `(default ((,class (:background ,white :foreground ,gray-0))))
    `(eshell-prompt ((t (:foreground ,blue))))
    `(fringe ((t (:inherit default))))
-   `(highlight ((t (:foreground ,white :background ,blue :box (:line-width -1 :color ,silver-6)))))
+   `(highlight ((t (:foreground ,white :background ,black))))
    `(highlight-changes-delete ((t (:underline ,red))))
-   `(highlight-changes ((t (:background ,silver-9))))
-   `(hl-line ((t (:background ,silver-9))))
-   `(isearch ((t (:foreground ,white :background ,black :underline nil :box nil))))
-   `(isearch-fail ((t (:foreground ,white :background ,red))))
-   `(lazy-highlight ((t (:foreground ,black :background ,silver-8 :box (:line-width -1 :color ,silver-9)))))
-   `(linum ((t (:foreground ,silver-7 :background ,white))))
+   `(highlight-changes ((t (:background ,gray-9))))
+   `(hl-line ((t (:background ,gray-9))))
+   `(isearch ((t (:foreground ,white :background ,red :underline nil :box nil))))
+   `(isearch-fail ((t (:foreground ,red :background ,red-bg))))
+   `(lazy-highlight ((t (:foreground ,black :background ,gray-8 :box (:line-width -1 :color ,gray-9)))))
+   `(linum ((t (:foreground ,gray-7 :background ,white))))
    `(match ((t (:weight bold))))
    `(minibuffer-prompt ((t (:foreground ,blue :background ,white))))
    `(mode-line ((t (:foreground ,white :background ,blue :box (:line-width 1 :color ,blue :style nil)))))
-   `(mode-line-buffer-id ((t (:foreground ,white :distant-foreground ,black :weight bold :box (:line-width 1 :color ,silver-6 :style nil)))))
-   `(mode-line-highlight ((t (:foreground ,red :background ,red-bg :box (:line-width 1 :color ,red-bg :style nil)))))
-   `(mode-line-inactive ((t (:foreground ,silver-2 :background ,silver-9 :box (:line-width 1 :color ,silver-6 :style nil)))))
-   `(region ((t (:background ,blue-bg))))
-   `(shadow ((,class (:foreground ,silver-6 :weight bold))))
+   `(mode-line-buffer-id ((t (:foreground ,white :distant-foreground ,black :weight bold :box (:line-width 1 :color ,gray-6 :style nil)))))
+   `(mode-line-highlight ((t (:foreground ,white :background ,black :box (:line-width 1 :color ,black :style nil)))))
+   `(mode-line-inactive ((t (:foreground ,gray-2 :background ,gray-9 :box (:line-width 1 :color ,gray-6 :style nil)))))
+   `(region ((t (:background ,gray-8))))
+   `(shadow ((,class (:foreground ,gray-6 :weight bold))))
    `(show-paren-match ((t (:weight bold :foreground ,blue :background ,blue-bg))))
    `(show-paren-mismatch ((t (:foreground ,red :background nil :underline t))))
    `(underline ((t (:underline nil))))
-   `(window-divider ((t (:foreground ,silver-7))))
-   `(window-divider-first-pixel ((t (:foreground ,silver-9))))
-   `(window-divider-last-pixel ((t (:foreground ,silver-9))))
+   `(window-divider ((t (:foreground ,gray-7))))
+   `(window-divider-first-pixel ((t (:foreground ,gray-9))))
+   `(window-divider-last-pixel ((t (:foreground ,gray-9))))
 
    ;; font lock
    `(font-lock-warning-face ((t (:foreground ,red))))
    `(font-lock-builtin-face ((t (:foreground ,blue))))
-   `(font-lock-comment-face ((t (:foreground ,silver-5 :slant italic))))
-   `(font-lock-comment-delimiter-face ((t (:foreground ,silver-3 :slant italic))))
+   `(font-lock-comment-face ((t (:foreground ,gray-5 :slant italic))))
+   `(font-lock-comment-delimiter-face ((t (:foreground ,gray-3 :slant italic))))
    `(font-lock-preprocessor-face ((t (:foreground ,blue :weight bold))))
-   `(font-lock-constant-face ((t (:foreground ,silver-4))))
+   `(font-lock-constant-face ((t (:foreground ,gray-4))))
    `(font-lock-string-face ((t (:foreground ,blue))))
-   `(font-lock-doc-face ((t (:foreground ,silver-4 :slant normal))))
+   `(font-lock-doc-face ((t (:foreground ,gray-4 :slant normal))))
    `(font-lock-keyword-face ((t (:foreground ,blue :weight normal))))
    `(font-lock-type-face ((t (:foreground ,red :slant normal))))
-   `(font-lock-variable-name-face ((t (:foreground ,silver-3))))
+   `(font-lock-variable-name-face ((t (:foreground ,gray-3))))
    `(font-lock-function-name-face ((t (:foreground ,blue))))
 
    ;; org/calendar/diary
    `(org-agenda-date-today ((t (:foreground ,blue :background ,blue-bg))))
-   `(org-block ((t (:foreground ,silver-3))))
-   `(org-code ((t (:foreground ,silver-3))))
+   `(org-block ((t (:foreground ,gray-3))))
+   `(org-code ((t (:foreground ,gray-3))))
    `(org-date ((t (:foreground ,blue))))
-   `(org-done ((t (:foreground ,silver-3 :box (:line-width -1 :color ,silver-4 :style nil)))))
+   `(org-done ((t (:foreground ,gray-3 :box (:line-width -1 :color ,gray-4 :style nil)))))
    `(org-level-1 ((t (:foreground ,black :weight bold))))
    `(org-level-2 ((t (:foreground ,black :weight bold))))
    `(org-level-3 ((t (:foreground ,black :weight bold))))
    `(org-link ((t (:foreground ,blue :underline ,blue))))
-   `(org-tag ((t (:foreground ,silver-7))))
+   `(org-tag ((t (:foreground ,gray-7))))
    `(org-todo ((t (:foreground ,red :box (:line-width -1 :color ,red :style nil)))))
 
    ;; dired
    `(dired-directory ((t (:foreground ,blue :underline ,blue))))
-   `(dired-marked ((t (:background ,silver-7 :weight bold))))
-   `(dired-ignored ((t (:foreground ,silver-6 :slant italic))))
+   `(dired-marked ((t (:background ,gray-7 :weight bold))))
+   `(dired-ignored ((t (:foreground ,gray-6 :slant italic))))
    `(dired-flagged ((t (:background ,red-bg :weight bold))))
 
    ;; ido
@@ -134,7 +133,7 @@
    `(markdown-link-face ((t (:inherit dired-directory))))
    `(markdown-url-face ((t (:foreground ,blue :underline t))))
    `(markdown-reference-face ((t (:foreground ,blue))))
-   `(markdown-list-face ((t (:foreground ,silver-3))))
+   `(markdown-list-face ((t (:foreground ,gray-3))))
 
    ;; diff mode
    `(diff-context ((t (:inherit default))))
@@ -143,18 +142,18 @@
    `(diff-hunk-header ((t (:foreground ,black :weight bold))))
    `(diff-indicator-added ((t (:foreground ,blue :weight bold :slant italic))))
    `(diff-indicator-removed ((t (:foreground ,red :weight bold :slant italic))))
-   `(diff-changed ((t (:foreground ,silver-1 :background ,silver-8))))
-   `(diff-refine-changed ((t (:foreground ,silver-0 :background ,silver-7 :weight bold))))
-   `(diff-added ((t (:foreground ,blue :background ,silver-8))))
-   `(diff-refine-added ((t (:foreground ,blue :background ,silver-7 :weight bold))))
-   `(diff-removed ((t (:foreground ,red :background ,silver-8))))
-   `(diff-refine-removed ((t (:foreground ,red :background ,silver-7 :weight bold))))
+   `(diff-changed ((t (:foreground ,gray-1 :background ,gray-8))))
+   `(diff-refine-changed ((t (:foreground ,gray-0 :background ,gray-7 :weight bold))))
+   `(diff-added ((t (:foreground ,blue :background ,gray-8))))
+   `(diff-refine-added ((t (:foreground ,blue :background ,gray-7 :weight bold))))
+   `(diff-removed ((t (:foreground ,red :background ,gray-8))))
+   `(diff-refine-removed ((t (:foreground ,red :background ,gray-7 :weight bold))))
 
    ;; ediff A
-   `(ediff-even-diff-A ((t (:foreground ,silver-3 :background ,silver-9))))
-   `(ediff-odd-diff-A ((t (:foreground ,silver-3 :background ,silver-9))))
-   `(ediff-current-diff-A ((t (:foreground ,blue :background ,silver-8))))
-   `(ediff-fine-diff-A ((t (:foreground ,blue :background ,silver-7 :weight bold))))
+   `(ediff-even-diff-A ((t (:foreground ,gray-3 :background ,gray-9))))
+   `(ediff-odd-diff-A ((t (:foreground ,gray-3 :background ,gray-9))))
+   `(ediff-current-diff-A ((t (:foreground ,blue :background ,gray-8))))
+   `(ediff-fine-diff-A ((t (:foreground ,blue :background ,gray-7 :weight bold))))
 
    ;; ediff B and C inherit faces
    `(ediff-even-diff-B ((t (:inherit ediff-even-diff-A))))
@@ -167,10 +166,10 @@
    `(ediff-fine-diff-C ((t (:inherit ediff-fine-diff-A))))
 
    ;; customize
-   `(custom-button ((t (:inherit variable-pitch :box (:line-width 1 :color ,silver-5 :style nil) :foreground ,black  :background ,silver-7 :weight normal))))
-   `(custom-button-mouse ((t (:inherit variable-pitch :box (:line-width 1 :color ,blue :style nil) :foreground ,black :background ,silver-6 :weight normal))))
-   `(custom-button-pressed ((t (:inherit variable-pitch :box (:line-width 1 :color ,blue :style nil) :foreground ,black :background ,silver-5 :weight normal))))
-   `(widget-field ((t (:background ,silver-8 :foreground ,silver-2))))
+   `(custom-button ((t (:inherit variable-pitch :box (:line-width 1 :color ,gray-5 :style nil) :foreground ,black  :background ,gray-7 :weight normal))))
+   `(custom-button-mouse ((t (:inherit variable-pitch :box (:line-width 1 :color ,blue :style nil) :foreground ,black :background ,gray-6 :weight normal))))
+   `(custom-button-pressed ((t (:inherit variable-pitch :box (:line-width 1 :color ,blue :style nil) :foreground ,black :background ,gray-5 :weight normal))))
+   `(widget-field ((t (:background ,gray-8 :foreground ,gray-2))))
    `(button ((t (:inherit variable-pitch :foreground ,blue :underline ,blue))))
    ))