Reconciled my themes with ediff :-)

2 files changed, 19 insertions, 16 deletions

diff --git a/themes/sd-dark-theme.el b/themes/sd-dark-theme.el
index 93f101e..9def71d 100644
--- a/themes/sd-dark-theme.el
+++ b/themes/sd-dark-theme.el
@@ -50,7 +50,7 @@
  '(next-error ((t (:inherit region))))
  '(org-block ((t (:foreground "light slate blue" :background "smoke" :inherit fixed-pitch))))
  '(org-checkbox ((t (:weight bold :inherit org-meta-line))))
- '(org-code ((t (:background "light grey" :foreground "black" :weight normal :family "Hack"))))
+ '(org-code ((t (:background "gainsboro" :foreground "black" :family "Hack"))))
  '(org-date ((t (:inherit (link fixed-pitch)))))
  '(org-document-info ((t (:weight bold))))
  '(org-document-info-keyword ((t (:inherit org-meta-line))))
@@ -69,7 +69,7 @@
  '(org-level-7 ((t (:inherit org-level-4))))
  '(org-level-8 ((t (:inherit org-level-4))))
  '(org-meta-line ((t (:foreground "SteelBlue" :family "Hermit"))))
- '(org-priority ((t (:inherit org-meta-line))))
+ '(org-priority ((t (:background "grey20" :inherit org-meta-line))))
  '(org-quote ((t (:inherit variable-pitch :slant italic))))
  '(org-special-keyword ((t (:background "grey20" :weight bold :inherit org-meta-line))))
  '(org-table ((t (:family "Hack"))))
@@ -84,10 +84,13 @@
  '(swiper-match-face-2 ((t (:inherit isearch))))
  '(swiper-match-face-3 ((t (:foreground "chocolate" :inherit isearch))))
  '(swiper-match-face-4 ((t (:foreground "yellow" :inherit isearch))))
- '(tooltip ((t (:inherit variable-pitch :background "lightyellow" :foreground "black"))))
+ '(tooltip ((t (:background "gainsboro" :foreground "black" :family "Hermit"))))
  '(trailing-whitespace ((((class color) (background light)) (:background "red1")) (((class color) (background dark)) (:background "red1")) (t (:inverse-video t))))
  '(variable-pitch ((t (:family "Public Sans"))))
  '(line-number ((t (:background "grey15" :foreground "LightSteelBlue3" :weight normal :height 0.8 :family "Hack"))))
+ '(show-paren-match ((t (:inherit highlight))))
+ '(show-paren-mismatch ((t (:background "red" :foreground "grey20"))))
+  '(widget-field ((t (:extend t :background "LightSteelBlue2"))))
  '(default ((t (:background "grey20" :foreground "white" :height 142 :family "Hack")))))
 
 (provide-theme 'sd-dark)
diff --git a/themes/sd-light-theme.el b/themes/sd-light-theme.el
index b466c8a..87c3cac 100644
--- a/themes/sd-light-theme.el
+++ b/themes/sd-light-theme.el
@@ -15,11 +15,11 @@
  '(fixed-pitch ((t (:family "Hack"))))
  '(font-lock-builtin-face ((t (:foreground "medium purple"))))
  '(font-lock-comment-delimiter-face ((t (:inherit fixed-pitch :foreground "slate gray"))))
- '(font-lock-comment-face ((t (:foreground "light slate gray" :slant italic))))
+ '(font-lock-comment-face ((t (:inherit fixed-pitch :foreground "light slate gray" :slant italic))))
  '(font-lock-constant-face ((t (:foreground "MediumOrchid4"))))
- '(font-lock-doc-face ((t (:inherit variable-pitch :foreground "black"))))
- '(font-lock-function-name-face ((t (:foreground "DarkOrchid4" :weight bold))))
- '(font-lock-keyword-face ((t (:foreground "medium violet red"))))
+ '(font-lock-doc-face ((t (:weight normal :inherit variable-pitch :foreground "black"))))
+ '(font-lock-function-name-face ((t (:foreground "medium violet red" :weight bold))))
+ '(font-lock-keyword-face ((t (:foreground "violet"))))
  '(font-lock-negation-char-face ((t nil)))
  '(font-lock-preprocessor-face ((t (:inherit font-lock-builtin-face))))
  '(font-lock-regexp-grouping-backslash ((t (:inherit bold :foreground "dark orange"))))
@@ -46,7 +46,7 @@
  '(mode-line-buffer-id ((t (:weight bold))))
  '(mode-line-emphasis ((t (:weight bold))))
  '(mode-line-highlight ((t (:box (:line-width 2 :color "grey40" :style released-button)))))
- '(mode-line-inactive ((t (:box (:line-width -1 :color "gainsboro") :foreground "gainsboro" :background "SteelBlue4" :family "Hack" :height 1.2))))
+ '(mode-line-inactive ((t (:height 1.2 :family "Hack" :background "SteelBlue4" :foreground "gainsboro" :box (:line-width -1 :color "gainsboro")))))
  '(next-error ((t (:inherit region))))
  '(org-block ((t (:foreground "light slate blue" :background "smoke" :inherit fixed-pitch))))
  '(org-checkbox ((t (:weight bold :inherit org-meta-line))))
@@ -63,19 +63,19 @@
  '(org-level-1 ((t (:weight bold :height 1.8))))
  '(org-level-2 ((t (:height 1.6))))
  '(org-level-3 ((t (:height 1.4))))
- '(org-level-4 ((t (:height 1.2))))
- '(org-level-5 ((t (:height 1.1))))
- '(org-level-6 ((t (:inherit org-level-5))))
- '(org-level-7 ((t (:inherit org-level-5))))
- '(org-level-8 ((t (:inherit org-level-5))))
+ '(org-level-4 ((t (:height 1.0))))
+ '(org-level-5 ((t (:inherit org-level-4))))
+ '(org-level-6 ((t (:inherit org-level-4))))
+ '(org-level-7 ((t (:inherit org-level-4))))
+ '(org-level-8 ((t (:inherit org-level-4))))
  '(org-meta-line ((t (:foreground "SteelBlue" :family "Hermit"))))
  '(org-priority ((t (:background "white" :inherit org-meta-line))))
  '(org-quote ((t (:inherit variable-pitch :slant italic))))
  '(org-special-keyword ((t (:background "white" :weight bold :inherit org-meta-line))))
  '(org-table ((t (:family "Hack"))))
- '(org-tag ((t (:inherit link))))
+ '(org-tag ((t (:inherit (link fixed-pitch)))))
  '(org-todo ((t (:background "coral" :foreground "white" :weight bold :height 1.4 :family "Hermit"))))
- '(org-verbatim ((t (:foreground "DodgerBlue1" :foundry "Hack"))))
+ '(org-verbatim ((t (:foreground "DodgerBlue1" :weight normal :foundry "Hack"))))
  '(query-replace ((t (:inherit (isearch)))))
  '(region ((t (:background "gainsboro"))))
  '(secondary-selection ((((class color) (min-colors 88) (background light)) (:background "yellow1")) (((class color) (min-colors 88) (background dark)) (:background "SkyBlue4")) (((class color) (min-colors 16) (background light)) (:background "yellow")) (((class color) (min-colors 16) (background dark)) (:background "SkyBlue4")) (((class color) (min-colors 8)) (:foreground "black" :background "cyan")) (t (:inverse-video t))))
@@ -91,6 +91,6 @@
  '(show-paren-match ((t (:inherit highlight))))
  '(show-paren-mismatch ((t (:background "red" :foreground "white"))))
  '(widget-field ((t (:extend t :background "LightSteelBlue2"))))
- '(default ((t (:background "white" :foreground "black" :height 140 :family "Hack")))))
+ '(default ((t (:background "white" :foreground "black" :height 142 :family "Hack")))))
 
 (provide-theme 'sd-light)