branch: elpa/spacemacs-theme
commit 7900aca87f9d96bd6ebaa62886e4ab135bf449b3
Author: Jonas Bernoulli <[email protected]>
Commit: Nasser Alshammari <[email protected]>

    Improve magit's diff-related heading faces (#88)
    
    * Remove obsolete magit faces
    
    * Improve magit's diff-related heading faces
    
    Legend:
    *   neutral remark
    -   that's not good
    +   that's good
    
    Before:
    * File headings have a dedicated background and foreground.
      - The current file heading(s) are not highlighted.
    * Hunk headings have a dedicated background and foreground.
      - The current hunk heading(s) are not highlighted.
    - When the parent of file sections (e.g. "Staged Changes")
      is current, then the headings of its children do not look
      the same as its own headings.
      * This was probably done intentional but if you do that,
        then they should still change appearance depending on
        whether they are selected or not.
      * However I think it is better if file headings behave
        the way almost all other headings behave and the
        special behavior is reserved to hunk headers.
    - File headings are the only headings that have a background
      color when not current.
      - For regular files the background lasts until the window edge.
        But for submodules only until the end of the file name.
      - When a submodule heading is current then the background lasts
        until the edge of the window, and the foreground color of the
        status text (e.g. "(modified content)") is lost.
    
    After:
    + Like all other headings file and hunk headings change appearance
      when highlighted.
      + It's easier to tell what is "current" and what is not.
    
    The Magit manual has a node about theming:
    https://magit.vc/manual/magit/Theming-Faces.html.
    
    It's a fairly complicated subject.
---
 spacemacs-common.el | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/spacemacs-common.el b/spacemacs-common.el
index 405063e0c6..760d34dc30 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -534,12 +534,8 @@ to 'auto, tags may not be properly aligned. "
      `(magit-branch-local ((,class (:background ,blue-bg :foreground ,blue 
:inherit bold))))
      `(magit-branch-remote ((,class (:background ,aqua-bg :foreground ,aqua 
:inherit bold))))
      `(magit-diff-context-highlight ((,class (:background ,bg2 :foreground 
,base))))
-     `(magit-diff-file-header ((,class (:background ,comment-bg :foreground 
,comment))))
-     `(magit-diff-file-heading ((,class (:background ,comment-bg :foreground 
,comment))))
-     `(magit-diff-file-heading-highlight ((,class (:background ,comment-bg 
:foreground ,comment))))
-     `(magit-diff-hunk-header ((,class (:background ,ttip-bg :foreground 
,ttip))))
      `(magit-diff-hunk-heading ((,class (:background ,ttip-bg :foreground 
,ttip))))
-     `(magit-diff-hunk-heading-highlight ((,class (:background ,ttip-bg 
:foreground ,ttip))))
+     `(magit-diff-hunk-heading-highlight ((,class (:background ,ttip-sl 
:foreground ,base))))
      `(magit-hash ((,class (:foreground ,var))))
      `(magit-hunk-heading           ((,class (:background ,bg3))))
      `(magit-hunk-heading-highlight ((,class (:background ,bg3))))

Reply via email to