branch: elpa/ample-theme
commit 4aa9057bd72fc98b1227581bbbda65a7b7236ea2
Author: unknown <[email protected]>
Commit: unknown <[email protected]>
better ediff colors
---
ample-theme.el | 98 ++++++++++++++++++++++++++++++----------------------------
1 file changed, 50 insertions(+), 48 deletions(-)
diff --git a/ample-theme.el b/ample-theme.el
index 48e03c9..2638505 100644
--- a/ample-theme.el
+++ b/ample-theme.el
@@ -275,56 +275,58 @@
`(ac-yasnippet-candidate-face ((t (:inherit ac-candidate-face))))
`(ac-yasnippet-selection-face ((t (:inherit ac-selection-face))))
- ;; ediff
- `(ediff-current-diff-A((t (:foreground "white" :background
,ample/dark-red))))
- `(ediff-current-diff-B((t (:foreground "white" :background
,ample/dark-green))))
- `(ediff-current-diff-C((t (:foreground "black" :background ,ample/yellow))))
- ;;`(ediff-current-diff-Ancestor((t ())))
+
;; w3m
- ;;`(w3m-anchor ((t (:foreground "cyan" :background nil))))
- ;;`(w3m-arrived-anchor ((t (:foreground "LightSkyBlue" :background nil))))
- `(w3m-bold ((t (:foreground ,ample/blue :background nil :bold t))))
- `(w3m-current-anchor ((t (:foreground nil :background nil :underline t
:bold t))))
- ;;`(w3m-form ((t (:foreground "red" :background nil :underline t))))
- ;;`(w3m-form-button ((t (:foreground "red" :background nil :underline t))))
- ;;`(w3m-form-button-mouse ((t (:foreground "red" :background nil
:underline t))))
- ;;`(w3m-form-button-pressed ((t (:foreground "red" :background nil
:underline t))))
- ;;`(w3m-form-inactive ((t (:foreground "grey70" :background nil :underline
t))))
- ;;`(w3m-header-line-location-content ((t (:foreground "LightGoldenrod"
:background "Gray20"))))
- ;;`(w3m-header-line-location-title ((t (:foreground "Cyan" :background
"Gray20"))))
- ;;`(w3m-history-current-url ((t (:foreground "LightSkyBlue" :background
"SkyBlue4"))))
- ;;`(w3m-image ((t (:foreground "PaleGreen" :background nil))))
- ;;`(w3m-image-anchor ((t (:foreground nil :background "dark green"))))
- ;;`(w3m-insert ((t (:foreground "orchid" :background nil))))
- `(w3m-italic ((t (:foreground ,ample/orange :background nil :underline
t))))
- ;;`(w3m-session-select ((t (:foreground "cyan" :background nil))))
- ;;`(w3m-session-selected ((t (:foreground "cyan" :background nil
:underline t :bold t))))
- ;;`(w3m-strike-through ((t (:foreground nil :background nil))))
- ;;`(w3m-tab-background ((t (:foreground "black" :background "white"))))
- ;;`(w3m-tab-mouse ((t (:foreground nil :background nil))))
- ;;`(w3m-tab-selected ((t (:foreground "black" :background "cyan"))))
- ;;`(w3m-tab-selected-background ((t (:foreground "black" :background
"white"))))
- ;;`(w3m-tab-selected-retrieving ((t (:foreground "red" :background
"cyan"))))
- ;;`(w3m-tab-unselected ((t (:foreground "black" :background "blue"))))
- ;;`(w3m-tab-unselected-retrieving ((t (:foreground "OrangeRed" :background
"blue"))))
- ;;`(w3m-tab-unselected-unseen ((t (:foreground "gray60" :background
"blue"))))
- `(w3m-underline ((t (:foreground ,ample/green :background nil :underline
t))))
-
- `(ediff-even-diff-A((t (:foreground ,ample/bg :background ,ample/fg))))
- `(ediff-even-diff-B((t (:foreground ,ample/bg :background ,ample/fg))))
- `(ediff-even-diff-C((t (:foreground ,ample/bg :background ,ample/fg))))
- ;;`(ediff-even-diff-Ancestor((t ())))
-
- `(ediff-fine-diff-A((t (:foreground "white" :background ,ample/red))))
- `(ediff-fine-diff-B((t (:foreground "white" :background ,ample/green))))
- `(ediff-fine-diff-C((t (:foreground "black" :background
,ample/bright-yellow))))
- ;;`(ediff-fine-diff-Ancestor((t ())))
-
- `(ediff-odd-diff-A((t (:foreground ,ample/bg :background ,ample/gray))))
- `(ediff-odd-diff-B((t (:foreground ,ample/bg :background ,ample/gray))))
- `(ediff-odd-diff-C((t (:foreground ,ample/bg :background ,ample/gray))))
- ;;`(ediff-odd-diff-Ancestor((t ())))
+ ;;`(w3m-anchor ((t (:foreground "cyan" :background
nil))))
+ ;;`(w3m-arrived-anchor ((t (:foreground "LightSkyBlue"
:background nil))))
+ `(w3m-bold ((t (:foreground ,ample/blue
:background nil :bold t))))
+ `(w3m-current-anchor ((t (:foreground nil
:background nil :underline t :bold t))))
+ ;;`(w3m-form ((t (:foreground "red"
:background nil :underline t))))
+ ;;`(w3m-form-button ((t (:foreground "red" :background nil
:underline t))))
+ ;;`(w3m-form-button-mouse ((t (:foreground "red" :background nil
:underline t))))
+ ;;`(w3m-form-button-pressed ((t (:foreground "red" :background nil
:underline t))))
+ ;;`(w3m-form-inactive ((t (:foreground "grey70" :background
nil :underline t))))
+ ;;`(w3m-header-line-location-content ((t (:foreground "LightGoldenrod"
:background "Gray20"))))
+ ;;`(w3m-header-line-location-title ((t (:foreground "Cyan" :background
"Gray20"))))
+ ;;`(w3m-history-current-url ((t (:foreground "LightSkyBlue"
:background "SkyBlue4"))))
+ ;;`(w3m-image ((t (:foreground "PaleGreen"
:background nil))))
+ ;;`(w3m-image-anchor ((t (:foreground nil
:background "dark green"))))
+ ;;`(w3m-insert ((t (:foreground "orchid" :background
nil))))
+ `(w3m-italic ((t (:foreground ,ample/orange
:background nil :underline t))))
+ ;;`(w3m-session-select ((t (:foreground "cyan" :background
nil))))
+ ;;`(w3m-session-selected ((t (:foreground "cyan" :background nil
:underline t :bold t))))
+ ;;`(w3m-strike-through ((t (:foreground nil :background nil))))
+ ;;`(w3m-tab-background ((t (:foreground "black" :background
"white"))))
+ ;;`(w3m-tab-mouse ((t (:foreground nil :background nil))))
+ ;;`(w3m-tab-selected ((t (:foreground "black"
:background "cyan"))))
+ ;;`(w3m-tab-selected-background ((t (:foreground "black" :background
"white"))))
+ ;;`(w3m-tab-selected-retrieving ((t (:foreground "red" :background
"cyan"))))
+ ;;`(w3m-tab-unselected ((t (:foreground "black" :background
"blue"))))
+ ;;`(w3m-tab-unselected-retrieving ((t (:foreground "OrangeRed"
:background "blue"))))
+ ;;`(w3m-tab-unselected-unseen ((t (:foreground "gray60" :background
"blue"))))
+ `(w3m-underline ((t (:foreground ,ample/green
:background nil :underline t))))
+
+
+ ;; ediff
+ `(ediff-current-diff-A((t (:foreground nil :background "#482828"))))
+ `(ediff-current-diff-B((t (:foreground nil :background "#284828"))))
+ `(ediff-current-diff-C((t (:foreground nil :background "#484828"))))
+ ;;`(ediff-current-diff-Ancestor((t ())))
+ `(ediff-even-diff-A ((t (:foreground nil :background
"#191925"))))
+ `(ediff-even-diff-B ((t (:foreground nil :background
"#191925"))))
+ `(ediff-even-diff-C ((t (:foreground nil :background
"#191925"))))
+ ;;`(ediff-even-diff-Ancestor ((t ())))
+
+ `(ediff-fine-diff-A ((t (:foreground ,ample/fg :background
"#694949"))))
+ `(ediff-fine-diff-B ((t (:foreground ,ample/fg :background
"#496949"))))
+ `(ediff-fine-diff-C ((t (:foreground ,ample/fg :background
"#696949"))))
+ ;;`(ediff-fine-diff-Ancestor ((t ())))
+
+ `(ediff-odd-diff-A ((t (:foreground nil :background
"#171723"))))
+ `(ediff-odd-diff-B ((t (:foreground nil :background
"#171723"))))
+ `(ediff-odd-diff-C ((t (:foreground nil :background
"#171723"))))
+ ;;`(ediff-odd-diff-Ancestor ((t ())))
;; man pages
`(Man-overstrike ((t (:foreground ,ample/blue))))
