fix bba1 theme

diff --git a/bba.org b/bba.org
index 4dbd3d5b2070aeddeb49e8590b83e9a4da5d1d6a..67181cdcd4fda78c4e6f21b02171dd3380f08a90 100644 (file)
--- a/bba.org
+++ b/bba.org
@@ -3095,8 +3095,6 @@ update copyrights
   ;;            (current-buffer))
 
   ;; (set-face-background-pixmap 'default "~/.emacs.d/xemacs-bg.xpm")
-  (set-foreground-color "green")
-  (set-background-color "black")
 
   ;; pos1: goto start of line, start of screen, start of buffer
   ;; end: goto end of line, end of screen, end of buffer
@@ -3190,27 +3188,56 @@ whole team. No matter what editor gets used.
 [[https://emacsfodder.github.io/emacs-theme-editor/][Emacs Theme Editor]] is a nice tool to define your colors.
 
 #+BEGIN_SRC emacs-lisp
-   (deftheme bba1 "DOCSTRING for bba1")
-     (custom-theme-set-faces 'bba1
-      '(default ((default (:foreground "#07e30d" :background "#000000" ))))
-      '(cursor ((default (:background "#f09213" ))))
-      '(fringe ((default (:background "#131313" ))))
-      '(mode-line ((default (:foreground "#282828" :background "#d96503" ))))
-      '(region ((default (:background "#7a7674" ))))
-      '(secondary-selection ((default (:background "#584e47" ))))
-      '(font-lock-builtin-face ((default (:foreground "#fe8019" ))))
-      '(font-lock-comment-face ((default (:foreground "#df7114" ))))
-      '(font-lock-function-name-face ((default (:foreground "#b8bb26" ))))
-      '(font-lock-keyword-face ((default (:foreground "#fb4934" ))))
-      '(font-lock-string-face ((default (:foreground "#b8bb26" ))))
-      '(font-lock-type-face ((default (:foreground "#d3869b" ))))
-      '(font-lock-constant-face ((default (:foreground "#d3869b" ))))
-      '(font-lock-variable-name-face ((default (:foreground "#83a598" ))))
-      '(minibuffer-prompt ((default (:foreground "#b8bb26" :bold t ))))
-      '(font-lock-warning-face ((default (:foreground "red" :bold t ))))
-      )
-   (provide-theme 'bba1)
-
+  (let* ((variable-tuple (cond ((x-list-fonts "Arial") '(:font "Arial"))
+                               ((x-list-fonts "Source Sans Pro") '(:font "Source Sans Pro"))
+                               ((x-list-fonts "Lucida Grande")   '(:font "Lucida Grande"))
+                               ((x-list-fonts "Verdana")         '(:font "Verdana"))
+                               ((x-family-fonts "Sans Serif")    '(:family "Sans Serif"))
+                               (nil (warn "Cannot find a Sans Serif Font.  Install Source Sans Pro."))))
+         (base-font-color     (face-foreground 'default nil 'default))
+         (headline           `(:inherit default :foreground "#62a9cd")))
+
+    (deftheme bba1 "DOCSTRING for bba1")
+    (custom-theme-set-faces 'bba1
+                            '(default ((default (:foreground "#07e30d" :background "#000000" ))))
+                            '(cursor ((default (:background "#f09213" ))))
+                            '(fringe ((default (:background "#131313" ))))
+                            '(mode-line ((default (:foreground "#282828" :background "#d96503" ))))
+                            '(region ((default (:background "#7a7674" ))))
+                            '(secondary-selection ((default (:background "#584e47" ))))
+                            '(font-lock-builtin-face ((default (:foreground "#fe8019" ))))
+                            '(font-lock-comment-face ((default (:foreground "#df7114" ))))
+                            '(font-lock-function-name-face ((default (:foreground "#b8bb26" ))))
+                            '(font-lock-keyword-face ((default (:foreground "#fb4934" ))))
+                            '(font-lock-string-face ((default (:foreground "#b8bb26" ))))
+                            '(font-lock-type-face ((default (:foreground "#d3869b" ))))
+                            '(font-lock-constant-face ((default (:foreground "#d3869b" ))))
+                            '(font-lock-variable-name-face ((default (:foreground "#83a598" ))))
+                            '(minibuffer-prompt ((default (:foreground "#b8bb26" :bold t ))))
+                            '(font-lock-warning-face ((default (:foreground "red" :bold t ))))
+                            '(org-block-begin-line ((t (:background "#07538a" :foreground "#84cbef" :extend t))) t)
+                            '(org-block-end-line ((t (:inherit org-block-begin-line))) t)
+                            '(org-block ((t (:inherit shadow :background "#29759c" :foreground "#84cbef" :distant-forground "#131313" :extend t))))
+                            ;; '(show-paren-match ((t (:distant-foreground "#29759c":background "#84cbef" ))))
+                            ;;'(show-paren-match ((t (:inverse-video t))))
+                            '(show-paren-match ((t (:underline (:color "#07e30d" :style line)))))
+                            '(show-paren-mismatch ((t (:underline (:color "red" :style wave)))))
+
+                            `(org-level-8 ((t (,@headline ,@variable-tuple))))
+                            `(org-level-7 ((t (,@headline ,@variable-tuple))))
+                            `(org-level-6 ((t (,@headline ,@variable-tuple))))
+                            `(org-level-5 ((t (,@headline ,@variable-tuple))))
+                            `(org-level-4 ((t (,@headline ,@variable-tuple :height 1.1))))
+                            `(org-level-3 ((t (,@headline ,@variable-tuple :height 1.25))))
+                            `(org-level-2 ((t (,@headline ,@variable-tuple :height 1.4))))
+                            `(org-level-1 ((t (,@headline ,@variable-tuple :height 1.6))))
+                            `(org-document-title ((t (,@headline ,@variable-tuple :height 1.5 :underline nil))))
+                            ))
+  (provide-theme 'bba1)
+  (enable-theme 'bba1)
+#+END_SRC
+
+#+begin_src emacs-lisp :eval never :tangle no
   (if (display-graphic-p)
       (progn
         (when (>= emacs-major-version 27)
@@ -3260,7 +3287,9 @@ whole team. No matter what editor gets used.
               ["black" "red3" "green3" "yellow3" "LightSkyBlue1" "magenta3" "cyan3" "gray90"]))
           )))
 
-#+END_SRC
+
+#+end_src
+
 * transparent window
 [2018-03-07 Wed 10:42]
 

diff --git a/custom.el b/custom.el
index f4468e269f644eef73bad66f3af3d7ce14b4432b..d5b90f242a5ef4994a4f25b276227db31a84d9e3 100644 (file)
--- a/custom.el
+++ b/custom.el
@@ -58,30 +58,3 @@
 :group 'SQL)
 
 (setq minibuffer-max-depth nil)
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(default ((t (:inherit nil :extend nil :stipple nil :background "#282828" :foreground "#07e30d" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 120 :width normal :foundry "nil" :family "Menlo"))))
- '(org-block ((t (:inherit shadow :background "#29759c" :foreground "#84cbef" :distant-forground "#131313" :extend t))))
- '(org-block-begin-line ((t (:background "#07538a" :foreground "#84cbef" :extend t))))
- '(org-block-end-line ((t (:inherit org-block-begin-line))))
- '(org-document-title ((t (:inherit default :foreground "#62a9cd" :font "Arial" :height 1.5 :underline nil))))
- '(org-level-1 ((t (:inherit default :foreground "#62a9cd" :font "Arial" :height 1.6))))
- '(org-level-2 ((t (:inherit default :foreground "#62a9cd" :font "Arial" :height 1.4))))
- '(org-level-3 ((t (:inherit default :foreground "#62a9cd" :font "Arial" :height 1.25))))
- '(org-level-4 ((t (:inherit default :foreground "#62a9cd" :font "Arial" :height 1.1))))
- '(org-level-5 ((t (:inherit default :foreground "#62a9cd" :font "Arial"))))
- '(org-level-6 ((t (:inherit default :foreground "#62a9cd" :font "Arial"))))
- '(org-level-7 ((t (:inherit default :foreground "#62a9cd" :font "Arial"))))
- '(org-level-8 ((t (:inherit default :foreground "#62a9cd" :font "Arial"))))
- '(rainbow-delimiters-depth-1-face ((t (:inherit rainbow-delimiters-base-face :foreground "yellow"))))
- '(rainbow-delimiters-depth-2-face ((t (:inherit rainbow-delimiters-base-face :foreground "magenta1"))))
- '(rainbow-delimiters-depth-3-face ((t (:inherit rainbow-delimiters-base-face :foreground "cyan"))))
- '(rainbow-delimiters-depth-4-face ((t (:inherit rainbow-delimiters-base-face :foreground "SteelBlue1"))))
- '(rainbow-delimiters-depth-5-face ((t (:inherit rainbow-delimiters-base-face :foreground "pink"))))
- '(rainbow-delimiters-depth-6-face ((t (:inherit rainbow-delimiters-base-face :foreground "OrangeRed1"))))
- '(show-paren-match ((t (:underline (:color "#07e30d" :style line)))))
- '(show-paren-mismatch ((t (:underline (:color "red" :style wave)))))
- '(stripes-face ((t :background "gray0"))))