branch: master
commit dad818345c363c1dfc2f23df6ac6e1a37b1c1f2a
Author: Oleh Krehel <[email protected]>
Commit: Oleh Krehel <[email protected]>
Make the minibuffer faces look nicer
* ivy.el (ivy-current-match): Update background and add white
foreground for light themes. Update background and add black
foreground for dark themes.
(ivy--add-face): If a face has an explicit foreground, add it ahead,
with no blending. Blend the background as usual.
* swiper.el (swiper-minibuffer-match-face-1):
(swiper-minibuffer-match-face-2): Update the background for light
themes.
(swiper-minibuffer-match-face-4): Update the background for dark themes.
---
ivy.el | 15 +++++++++++++--
swiper.el | 6 +++---
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ivy.el b/ivy.el
index c5a26ed..fd3543a 100644
--- a/ivy.el
+++ b/ivy.el
@@ -44,7 +44,10 @@
:group 'convenience)
(defface ivy-current-match
- '((t (:inherit highlight)))
+ '((((class color) (background light))
+ :background "#1a4b77" :foreground "white")
+ (((class color) (background dark))
+ :background "#65a7e2" :foreground "black"))
"Face used by Ivy for highlighting first match.")
(defface ivy-confirm-face
@@ -1408,7 +1411,15 @@ all of the text contained in the minibuffer."
`propertize' or `add-face-text-property' in this case."
(require 'colir)
(condition-case nil
- (colir-blend-face-background 0 (length str) face str)
+ (progn
+ (colir-blend-face-background 0 (length str) face str)
+ (let ((foreground (face-foreground face)))
+ (when foreground
+ (add-face-text-property
+ 0 (length str)
+ `(:foreground ,foreground)
+ nil
+ str))))
(error
(ignore-errors
(font-lock-append-text-property 0 (length str) 'face face str))))
diff --git a/swiper.el b/swiper.el
index 0de97e7..ae8a9ed 100644
--- a/swiper.el
+++ b/swiper.el
@@ -63,7 +63,7 @@
(defface swiper-minibuffer-match-face-1
'((((class color) (background light))
- :background "#dddddd")
+ :background "#d3d3d3")
(((class color) (background dark))
:background "#555555"))
"The background face for `swiper' minibuffer matches."
@@ -71,7 +71,7 @@
(defface swiper-minibuffer-match-face-2
'((((class color) (background light))
- :background "#bbbbbb" :weight bold)
+ :background "#e99ce8" :weight bold)
(((class color) (background dark))
:background "#777777" :weight bold))
"Face for `swiper' minibuffer matches modulo 1.")
@@ -87,7 +87,7 @@
'((((class color) (background light))
:background "#ffbbff" :weight bold)
(((class color) (background dark))
- :background "#ff77ff" :weight bold))
+ :background "#8a498a" :weight bold))
"Face for `swiper' minibuffer matches modulo 3.")
(defface swiper-line-face
