From 6a0773635e3aa0e7f7b04e1fae633cdab3cc72a8 Mon Sep 17 00:00:00 2001 From: Gulshan Singh Date: Fri, 2 Sep 2022 09:23:19 -0700 Subject: [PATCH 1/3] Add tab-line support --- CHANGELOG.md | 1 + zenburn-theme.el | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00544e3..e80cb35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * Add `helm-ff-file-extension` face. * Add `rmail` support. * Add `tab-bar-mode` support. +* Add `tab-line-mode` support. * [#367](https://github.com/bbatsov/zenburn-emacs/pull/367): Brighten org headline levels 7 and 8 to improve contrast and possibly help those with color blindness. * Add support for `ansi-color` faces. * Add support for SLY faces. diff --git a/zenburn-theme.el b/zenburn-theme.el index b9974c3..002e5ca 100644 --- a/zenburn-theme.el +++ b/zenburn-theme.el @@ -1556,6 +1556,18 @@ Also bind `class' to ((class color) (min-colors 89))." `(tab-bar-tab-inactive ((t (:foreground ,zenburn-fg :background ,zenburn-bg+1 :box (:line-width -1 :style released-button))))) +;;;;; tab-line + `(tab-line ((t (:background ,zenburn-bg+1)))) + `(tab-line-tab ((t (:foreground ,zenburn-fg + :background ,zenburn-bg + :weight bold + :box (:line-width -1 :style released-button))))) + `(tab-line-tab-inactive ((t (:foreground ,zenburn-fg + :background ,zenburn-bg+1 + :box (:line-width -1 :style released-button))))) + `(tab-line-tab-current ((t (:foreground ,zenburn-fg + :background ,zenburn-bg+1 + :box (:line-width -1 :style pressed-button))))) ;;;;; term `(term-color-black ((t (:foreground ,zenburn-bg :background ,zenburn-bg-1)))) From 0bafc9d721367664c814abeb2e6ba354a31e6daa Mon Sep 17 00:00:00 2001 From: Gulshan Singh Date: Fri, 2 Sep 2022 12:55:43 -0700 Subject: [PATCH 2/3] Update tab-bar and tab-line padding and style --- zenburn-theme.el | 51 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/zenburn-theme.el b/zenburn-theme.el index 002e5ca..d188de4 100644 --- a/zenburn-theme.el +++ b/zenburn-theme.el @@ -1549,25 +1549,36 @@ Also bind `class' to ((class color) (min-colors 89))." :box (:line-width -1 :style released-button))))) ;;;;; tab-bar `(tab-bar ((t (:background ,zenburn-bg+1)))) - `(tab-bar-tab ((t (:foreground ,zenburn-fg - :background ,zenburn-bg - :weight bold - :box (:line-width -1 :style released-button))))) - `(tab-bar-tab-inactive ((t (:foreground ,zenburn-fg - :background ,zenburn-bg+1 - :box (:line-width -1 :style released-button))))) + `(tab-bar-tab + ((t (:foreground ,zenburn-fg + :background ,zenburn-bg + :weight bold + :height 1.1 + :box (:line-width (6 . 4) :color ,zenburn-bg :style nil))))) + `(tab-bar-tab-inactive + ((t (:foreground ,zenburn-fg + :background ,zenburn-bg+1 + :height 1.1 + :box (:line-width (6 . 4) :color ,zenburn-bg+1 :style nil))))) ;;;;; tab-line `(tab-line ((t (:background ,zenburn-bg+1)))) - `(tab-line-tab ((t (:foreground ,zenburn-fg - :background ,zenburn-bg - :weight bold - :box (:line-width -1 :style released-button))))) - `(tab-line-tab-inactive ((t (:foreground ,zenburn-fg - :background ,zenburn-bg+1 - :box (:line-width -1 :style released-button))))) - `(tab-line-tab-current ((t (:foreground ,zenburn-fg - :background ,zenburn-bg+1 - :box (:line-width -1 :style pressed-button))))) + `(tab-line-tab + ((t (:foreground ,zenburn-fg + :background ,zenburn-bg+1 + :box (:line-width (6 . 4) :color ,zenburn-bg+1 :style nil))))) + `(tab-line-tab-inactive + ((t (:foreground ,zenburn-fg + :background ,zenburn-bg+1 + :box (:line-width (6 . 4) :color ,zenburn-bg+1 :style nil))))) + `(tab-line-tab-current + ((t (:foreground ,zenburn-fg + :background ,zenburn-bg + :weight bold + :box (:line-width (6 . 4) :color ,zenburn-bg :style nil))))) + `(tab-line-highlight + ((t (:foreground ,zenburn-fg + :background ,zenburn-bg+2 + :box (:line-width (6 . 4) :color ,zenburn-bg+2 :style nil))))) ;;;;; term `(term-color-black ((t (:foreground ,zenburn-bg :background ,zenburn-bg-1)))) @@ -1700,6 +1711,12 @@ Also bind `class' to ((class color) (min-colors 89))." ,zenburn-cyan ,zenburn-blue+1 ,zenburn-magenta)) ;;;;; pdf-tools `(pdf-view-midnight-colors '(,zenburn-fg . ,zenburn-bg-05)) +;;;;; tab-bar + ;; For some reason, the padding doesn't display properly if the + ;; tab-bar-separator is "", swe we use a zero-width space instead + `(tab-bar-separator "\u200b") +;;;;; tab-line + `(tab-line-separator "") ;;;;; vc-annotate `(vc-annotate-color-map '(( 20. . ,zenburn-red-1) From 6c85932944568fbed5fed6ba75781a4b7c78d311 Mon Sep 17 00:00:00 2001 From: Gulshan Singh Date: Fri, 2 Sep 2022 18:30:45 -0700 Subject: [PATCH 3/3] Add support for tab-line groups --- zenburn-theme.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/zenburn-theme.el b/zenburn-theme.el index d188de4..6627db7 100644 --- a/zenburn-theme.el +++ b/zenburn-theme.el @@ -1579,6 +1579,11 @@ Also bind `class' to ((class color) (min-colors 89))." ((t (:foreground ,zenburn-fg :background ,zenburn-bg+2 :box (:line-width (6 . 4) :color ,zenburn-bg+2 :style nil))))) + `(tab-line-tab-group + ((t (:foreground ,zenburn-fg + :background ,zenburn-bg-1 + :weight bold + :box (:line-width (6 . 4) :color ,zenburn-bg-1 :style nil))))) ;;;;; term `(term-color-black ((t (:foreground ,zenburn-bg :background ,zenburn-bg-1)))) @@ -1716,7 +1721,7 @@ Also bind `class' to ((class color) (min-colors 89))." ;; tab-bar-separator is "", swe we use a zero-width space instead `(tab-bar-separator "\u200b") ;;;;; tab-line - `(tab-line-separator "") + `(tab-line-separator "\u200b") ;;;;; vc-annotate `(vc-annotate-color-map '(( 20. . ,zenburn-red-1)