|
|
|
@ -1,13 +1,13 @@
|
|
|
|
|
;;; solarized.el --- Solarized for Emacs.
|
|
|
|
|
;;; solaryzed.el --- Solarized for Emacs.
|
|
|
|
|
|
|
|
|
|
;; Copyright (C) 2011-2019 Bozhidar Batsov
|
|
|
|
|
|
|
|
|
|
;; Author: Bozhidar Batsov <bozhidar@batsov.com>
|
|
|
|
|
;; Author: Thomas Frössman <thomasf@jossystem.se>
|
|
|
|
|
;; URL: http://github.com/bbatsov/solarized-emacs
|
|
|
|
|
;; URL: http://github.com/bbatsov/solaryzed-emacs
|
|
|
|
|
;; Version: 1.3.0
|
|
|
|
|
;; Package-Requires: ((emacs "24") (dash "2.16"))
|
|
|
|
|
;; Keywords: themes, solarized
|
|
|
|
|
;; Keywords: themes, solaryzed
|
|
|
|
|
|
|
|
|
|
;; This program is free software; you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
@ -28,7 +28,7 @@
|
|
|
|
|
;;
|
|
|
|
|
;;; Installation:
|
|
|
|
|
;;
|
|
|
|
|
;; Drop the `solarized-theme.el` somewhere in your `load-path` and
|
|
|
|
|
;; Drop the `solaryzed-theme.el` somewhere in your `load-path` and
|
|
|
|
|
;; the two themes in a folder that is on `custom-theme-load-path'
|
|
|
|
|
;; and enjoy!
|
|
|
|
|
;;
|
|
|
|
@ -46,87 +46,87 @@
|
|
|
|
|
|
|
|
|
|
;;; Options
|
|
|
|
|
|
|
|
|
|
(defgroup solarized nil
|
|
|
|
|
(defgroup solaryzed nil
|
|
|
|
|
"Solarized theme options.
|
|
|
|
|
The theme has to be reloaded after changing anything in this group."
|
|
|
|
|
:group 'faces)
|
|
|
|
|
|
|
|
|
|
(defcustom solarized-distinct-fringe-background nil
|
|
|
|
|
(defcustom solaryzed-distinct-fringe-background nil
|
|
|
|
|
"Make the fringe background different from the normal background color.
|
|
|
|
|
Also affects `linum-mode' background."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'solarized)
|
|
|
|
|
:group 'solaryzed)
|
|
|
|
|
|
|
|
|
|
(defcustom solarized-distinct-doc-face nil
|
|
|
|
|
(defcustom solaryzed-distinct-doc-face nil
|
|
|
|
|
"Make `font-lock-doc-face' stand out more.
|
|
|
|
|
Related discussion: https://github.com/bbatsov/solarized-emacs/issues/158"
|
|
|
|
|
Related discussion: https://github.com/bbatsov/solaryzed-emacs/issues/158"
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'solarized)
|
|
|
|
|
:group 'solaryzed)
|
|
|
|
|
|
|
|
|
|
(defcustom solarized-use-variable-pitch t
|
|
|
|
|
(defcustom solaryzed-use-variable-pitch t
|
|
|
|
|
"Use variable pitch face for some headings and titles."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'solarized)
|
|
|
|
|
:group 'solaryzed)
|
|
|
|
|
|
|
|
|
|
(defcustom solarized-use-less-bold nil
|
|
|
|
|
(defcustom solaryzed-use-less-bold nil
|
|
|
|
|
"Use bold weight less often."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'solarized)
|
|
|
|
|
:group 'solaryzed)
|
|
|
|
|
|
|
|
|
|
(defcustom solarized-use-more-italic nil
|
|
|
|
|
(defcustom solaryzed-use-more-italic nil
|
|
|
|
|
"Use italic slant more often."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'solarized)
|
|
|
|
|
:group 'solaryzed)
|
|
|
|
|
|
|
|
|
|
(defcustom solarized-emphasize-indicators t
|
|
|
|
|
(defcustom solaryzed-emphasize-indicators t
|
|
|
|
|
"Use more colors for indicators such as git:gutter, flycheck and similar."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'solarized)
|
|
|
|
|
:group 'solaryzed)
|
|
|
|
|
|
|
|
|
|
(defcustom solarized-high-contrast-mode-line nil
|
|
|
|
|
(defcustom solaryzed-high-contrast-mode-line nil
|
|
|
|
|
"Make the active/inactive mode line stand out more."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'solarized)
|
|
|
|
|
:group 'solaryzed)
|
|
|
|
|
|
|
|
|
|
(defcustom solarized-height-minus-1 0.8
|
|
|
|
|
(defcustom solaryzed-height-minus-1 0.8
|
|
|
|
|
"Font size -1."
|
|
|
|
|
:type 'number
|
|
|
|
|
:group 'solarized)
|
|
|
|
|
:group 'solaryzed)
|
|
|
|
|
|
|
|
|
|
(defcustom solarized-height-plus-1 1.1
|
|
|
|
|
(defcustom solaryzed-height-plus-1 1.1
|
|
|
|
|
"Font size +1."
|
|
|
|
|
:type 'number
|
|
|
|
|
:group 'solarized)
|
|
|
|
|
:group 'solaryzed)
|
|
|
|
|
|
|
|
|
|
(defcustom solarized-height-plus-2 1.15
|
|
|
|
|
(defcustom solaryzed-height-plus-2 1.15
|
|
|
|
|
"Font size +2."
|
|
|
|
|
:type 'number
|
|
|
|
|
:group 'solarized)
|
|
|
|
|
:group 'solaryzed)
|
|
|
|
|
|
|
|
|
|
(defcustom solarized-height-plus-3 1.2
|
|
|
|
|
(defcustom solaryzed-height-plus-3 1.2
|
|
|
|
|
"Font size +3."
|
|
|
|
|
:type 'number
|
|
|
|
|
:group 'solarized)
|
|
|
|
|
:group 'solaryzed)
|
|
|
|
|
|
|
|
|
|
(defcustom solarized-height-plus-4 1.3
|
|
|
|
|
(defcustom solaryzed-height-plus-4 1.3
|
|
|
|
|
"Font size +4."
|
|
|
|
|
:type 'number
|
|
|
|
|
:group 'solarized)
|
|
|
|
|
:group 'solaryzed)
|
|
|
|
|
|
|
|
|
|
(defcustom solarized-scale-org-headlines t
|
|
|
|
|
(defcustom solaryzed-scale-org-headlines t
|
|
|
|
|
"Whether `org-mode' headlines should be scaled."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'solarized)
|
|
|
|
|
:group 'solaryzed)
|
|
|
|
|
|
|
|
|
|
(defcustom solarized-scale-outline-headlines t
|
|
|
|
|
(defcustom solaryzed-scale-outline-headlines t
|
|
|
|
|
"Whether `outline-mode' headlines should be scaled."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'solarized)
|
|
|
|
|
:group 'solaryzed)
|
|
|
|
|
|
|
|
|
|
;;; Utilities
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun solarized-color-blend (color1 color2 alpha)
|
|
|
|
|
(defun solaryzed-color-blend (color1 color2 alpha)
|
|
|
|
|
"Blends COLOR1 onto COLOR2 with ALPHA.
|
|
|
|
|
|
|
|
|
|
COLOR1 and COLOR2 should be color names (e.g. \"white\") or RGB
|
|
|
|
@ -140,7 +140,7 @@ Alpha should be a float between 0 and 1."
|
|
|
|
|
(color-name-to-rgb color2))))
|
|
|
|
|
|
|
|
|
|
;;; Setup Start
|
|
|
|
|
(defmacro solarized-with-color-variables (variant &rest body)
|
|
|
|
|
(defmacro solaryzed-with-color-variables (variant &rest body)
|
|
|
|
|
(declare (indent defun))
|
|
|
|
|
`(let* ((class '((class color) (min-colors 89)))
|
|
|
|
|
(light-class (append '((background light)) class))
|
|
|
|
@ -248,48 +248,48 @@ Alpha should be a float between 0 and 1."
|
|
|
|
|
(green-lc (if (eq variant 'light) green-l green-d))
|
|
|
|
|
|
|
|
|
|
;; customize based face properties
|
|
|
|
|
(s-maybe-bold (if solarized-use-less-bold
|
|
|
|
|
(s-maybe-bold (if solaryzed-use-less-bold
|
|
|
|
|
'unspecified 'bold))
|
|
|
|
|
(s-maybe-italic (if solarized-use-more-italic
|
|
|
|
|
(s-maybe-italic (if solaryzed-use-more-italic
|
|
|
|
|
'italic 'normal))
|
|
|
|
|
(s-variable-pitch (if solarized-use-variable-pitch
|
|
|
|
|
(s-variable-pitch (if solaryzed-use-variable-pitch
|
|
|
|
|
'variable-pitch 'default))
|
|
|
|
|
(s-fringe-bg (if solarized-distinct-fringe-background
|
|
|
|
|
(s-fringe-bg (if solaryzed-distinct-fringe-background
|
|
|
|
|
base02 base03))
|
|
|
|
|
(s-fringe-fg base01)
|
|
|
|
|
|
|
|
|
|
(s-header-line-fg (if solarized-high-contrast-mode-line
|
|
|
|
|
(s-header-line-fg (if solaryzed-high-contrast-mode-line
|
|
|
|
|
base1 base0))
|
|
|
|
|
(s-header-line-bg (if solarized-high-contrast-mode-line
|
|
|
|
|
(s-header-line-bg (if solaryzed-high-contrast-mode-line
|
|
|
|
|
base02 base03))
|
|
|
|
|
(s-header-line-underline (if solarized-high-contrast-mode-line
|
|
|
|
|
(s-header-line-underline (if solaryzed-high-contrast-mode-line
|
|
|
|
|
nil base02))
|
|
|
|
|
|
|
|
|
|
(s-mode-line-fg (if solarized-high-contrast-mode-line
|
|
|
|
|
(s-mode-line-fg (if solaryzed-high-contrast-mode-line
|
|
|
|
|
base03 base0))
|
|
|
|
|
(s-mode-line-bg (if solarized-high-contrast-mode-line
|
|
|
|
|
(s-mode-line-bg (if solaryzed-high-contrast-mode-line
|
|
|
|
|
base0 base02))
|
|
|
|
|
(s-mode-line-underline (if solarized-high-contrast-mode-line
|
|
|
|
|
(s-mode-line-underline (if solaryzed-high-contrast-mode-line
|
|
|
|
|
nil s-line))
|
|
|
|
|
|
|
|
|
|
(s-mode-line-buffer-id-fg (if solarized-high-contrast-mode-line
|
|
|
|
|
(s-mode-line-buffer-id-fg (if solaryzed-high-contrast-mode-line
|
|
|
|
|
'unspecified base1))
|
|
|
|
|
(s-mode-line-inactive-fg (if solarized-high-contrast-mode-line
|
|
|
|
|
(s-mode-line-inactive-fg (if solaryzed-high-contrast-mode-line
|
|
|
|
|
base0 base01))
|
|
|
|
|
(s-mode-line-inactive-bg (if solarized-high-contrast-mode-line
|
|
|
|
|
(s-mode-line-inactive-bg (if solaryzed-high-contrast-mode-line
|
|
|
|
|
base02 base03))
|
|
|
|
|
(s-mode-line-inactive-bc (if solarized-high-contrast-mode-line
|
|
|
|
|
(s-mode-line-inactive-bc (if solaryzed-high-contrast-mode-line
|
|
|
|
|
base02 base02))
|
|
|
|
|
)
|
|
|
|
|
,@body))
|
|
|
|
|
|
|
|
|
|
(defun create-solarized-theme (variant theme-name &optional childtheme)
|
|
|
|
|
(defun create-solaryzed-theme (variant theme-name &optional childtheme)
|
|
|
|
|
"Create a VARIANT of the theme named THEME-NAME.
|
|
|
|
|
|
|
|
|
|
When optional argument CHILDTHEME function is supplied it's invoked to further
|
|
|
|
|
customize the resulting theme."
|
|
|
|
|
;;; Color palette
|
|
|
|
|
(solarized-with-color-variables variant
|
|
|
|
|
(solaryzed-with-color-variables variant
|
|
|
|
|
;;; Theme Faces
|
|
|
|
|
(custom-theme-set-faces
|
|
|
|
|
theme-name
|
|
|
|
@ -465,7 +465,7 @@ customize the resulting theme."
|
|
|
|
|
((,class (:foreground ,base01 :slant ,s-maybe-italic))))
|
|
|
|
|
`(font-lock-comment-face ((,class (:foreground ,base01))))
|
|
|
|
|
`(font-lock-constant-face ((,class (:foreground ,blue :weight bold))))
|
|
|
|
|
`(font-lock-doc-face ((,class (:foreground ,(if solarized-distinct-doc-face violet cyan)
|
|
|
|
|
`(font-lock-doc-face ((,class (:foreground ,(if solaryzed-distinct-doc-face violet cyan)
|
|
|
|
|
:slant ,s-maybe-italic))))
|
|
|
|
|
`(font-lock-function-name-face ((,class (:foreground ,blue))))
|
|
|
|
|
`(font-lock-keyword-face ((,class (:foreground ,green :weight ,s-maybe-bold))))
|
|
|
|
@ -541,23 +541,23 @@ customize the resulting theme."
|
|
|
|
|
`(font-latex-italic-face ((,class (:inherit italic :foreground ,base1))))
|
|
|
|
|
`(font-latex-math-face ((,class (:foreground ,violet))))
|
|
|
|
|
`(font-latex-sectioning-0-face ((,class (:inherit font-latex-sectioning-1-face
|
|
|
|
|
:height ,solarized-height-plus-1))))
|
|
|
|
|
:height ,solaryzed-height-plus-1))))
|
|
|
|
|
`(font-latex-sectioning-1-face ((,class (:inherit font-latex-sectioning-2-face
|
|
|
|
|
:height ,solarized-height-plus-1))))
|
|
|
|
|
:height ,solaryzed-height-plus-1))))
|
|
|
|
|
`(font-latex-sectioning-2-face ((,class (:inherit font-latex-sectioning-3-face
|
|
|
|
|
:height ,solarized-height-plus-1))))
|
|
|
|
|
:height ,solaryzed-height-plus-1))))
|
|
|
|
|
`(font-latex-sectioning-3-face ((,class (:inherit font-latex-sectioning-4-face
|
|
|
|
|
:height ,solarized-height-plus-1))))
|
|
|
|
|
:height ,solaryzed-height-plus-1))))
|
|
|
|
|
`(font-latex-sectioning-4-face ((,class (:inherit font-latex-sectioning-5-face
|
|
|
|
|
:height ,solarized-height-plus-1))))
|
|
|
|
|
:height ,solaryzed-height-plus-1))))
|
|
|
|
|
`(font-latex-sectioning-5-face ((,class (:inherit ,s-variable-pitch :foreground ,yellow
|
|
|
|
|
:weight bold))))
|
|
|
|
|
`(font-latex-sedate-face ((,class (:foreground ,base1))))
|
|
|
|
|
`(font-latex-slide-title-face ((,class (:inherit (,s-variable-pitch font-lock-type-face)
|
|
|
|
|
:weight bold :height ,solarized-height-plus-3))))
|
|
|
|
|
:weight bold :height ,solaryzed-height-plus-3))))
|
|
|
|
|
`(font-latex-string-face ((,class (:foreground ,cyan))))
|
|
|
|
|
`(font-latex-subscript-face ((,class (:height ,solarized-height-minus-1))))
|
|
|
|
|
`(font-latex-superscript-face ((,class (:height ,solarized-height-minus-1))))
|
|
|
|
|
`(font-latex-subscript-face ((,class (:height ,solaryzed-height-minus-1))))
|
|
|
|
|
`(font-latex-superscript-face ((,class (:height ,solaryzed-height-minus-1))))
|
|
|
|
|
`(font-latex-verbatim-face ((,class (:inherit fixed-pitch :foreground ,base0
|
|
|
|
|
:slant italic))))
|
|
|
|
|
`(font-latex-warning-face ((,class (:inherit bold :foreground ,orange))))
|
|
|
|
@ -607,7 +607,7 @@ customize the resulting theme."
|
|
|
|
|
`(cfw:face-saturday ((,class (:foreground ,cyan-hc :background ,cyan-lc))))
|
|
|
|
|
`(cfw:face-sunday ((,class (:foreground ,red-hc :background ,red-lc :weight bold))))
|
|
|
|
|
`(cfw:face-title ((,class (:inherit ,s-variable-pitch :foreground ,yellow
|
|
|
|
|
:weight bold :height ,solarized-height-plus-4))))
|
|
|
|
|
:weight bold :height ,solaryzed-height-plus-4))))
|
|
|
|
|
`(cfw:face-today ((,class (:weight bold :background ,base02 :foreground nil))))
|
|
|
|
|
`(cfw:face-today-title ((,class (:background ,yellow-lc
|
|
|
|
|
:foreground ,yellow-hc :weight bold))))
|
|
|
|
@ -674,13 +674,13 @@ customize the resulting theme."
|
|
|
|
|
`(ctbl:face-row-select ((,class (:background ,base02 :foreground ,base0
|
|
|
|
|
:underline t))))
|
|
|
|
|
;;;;; custom
|
|
|
|
|
`(custom-face-tag ((,class (:inherit ,s-variable-pitch :height ,solarized-height-plus-3
|
|
|
|
|
`(custom-face-tag ((,class (:inherit ,s-variable-pitch :height ,solaryzed-height-plus-3
|
|
|
|
|
:foreground ,violet :weight normal))))
|
|
|
|
|
`(custom-variable-tag ((,class (:inherit ,s-variable-pitch
|
|
|
|
|
:foreground ,cyan :height ,solarized-height-plus-3))))
|
|
|
|
|
:foreground ,cyan :height ,solaryzed-height-plus-3))))
|
|
|
|
|
`(custom-comment-tag ((,class (:foreground ,base01))))
|
|
|
|
|
`(custom-group-tag ((,class (:inherit ,s-variable-pitch :foreground ,blue :height ,solarized-height-plus-3))))
|
|
|
|
|
`(custom-group-tag-1 ((,class (:inherit ,s-variable-pitch :foreground ,red :height ,solarized-height-plus-3))))
|
|
|
|
|
`(custom-group-tag ((,class (:inherit ,s-variable-pitch :foreground ,blue :height ,solaryzed-height-plus-3))))
|
|
|
|
|
`(custom-group-tag-1 ((,class (:inherit ,s-variable-pitch :foreground ,red :height ,solaryzed-height-plus-3))))
|
|
|
|
|
`(custom-state ((,class (:foreground ,green))))
|
|
|
|
|
`(custom-button ((,class (:background ,base02 :foreground ,base1
|
|
|
|
|
:box (:line-width 2 :style released-button)))))
|
|
|
|
@ -702,19 +702,19 @@ customize the resulting theme."
|
|
|
|
|
`(diff-removed ((,class (:foreground ,red))))
|
|
|
|
|
`(diff-refine-added
|
|
|
|
|
((,light-class
|
|
|
|
|
(:background ,(solarized-color-blend "#ddffdd" green 0.7)))
|
|
|
|
|
(:background ,(solaryzed-color-blend "#ddffdd" green 0.7)))
|
|
|
|
|
(,dark-class
|
|
|
|
|
(:background ,(solarized-color-blend "#446644" green 0.7)))))
|
|
|
|
|
(:background ,(solaryzed-color-blend "#446644" green 0.7)))))
|
|
|
|
|
`(diff-refine-changed
|
|
|
|
|
((,light-class
|
|
|
|
|
(:background ,(solarized-color-blend "#ddddff" blue 0.7)))
|
|
|
|
|
(:background ,(solaryzed-color-blend "#ddddff" blue 0.7)))
|
|
|
|
|
(,dark-class
|
|
|
|
|
(:background ,(solarized-color-blend "#444466" blue 0.7)))))
|
|
|
|
|
(:background ,(solaryzed-color-blend "#444466" blue 0.7)))))
|
|
|
|
|
`(diff-refine-removed
|
|
|
|
|
((,light-class
|
|
|
|
|
(:background ,(solarized-color-blend "#ffdddd" red 0.7)))
|
|
|
|
|
(:background ,(solaryzed-color-blend "#ffdddd" red 0.7)))
|
|
|
|
|
(,dark-class
|
|
|
|
|
(:background ,(solarized-color-blend "#664444" red 0.7)))))
|
|
|
|
|
(:background ,(solaryzed-color-blend "#664444" red 0.7)))))
|
|
|
|
|
`(diff-header ((,class (:background ,base03))))
|
|
|
|
|
`(diff-file-header
|
|
|
|
|
((,class (:background ,base03 :foreground ,base0 :weight bold))))
|
|
|
|
@ -745,28 +745,28 @@ customize the resulting theme."
|
|
|
|
|
|
|
|
|
|
;;;;;; alternative ediff (not finished)
|
|
|
|
|
;; `(ediff-fine-diff-A ((,class (
|
|
|
|
|
;; :background ,(solarized-color-blend blue base03 0.25))
|
|
|
|
|
;; :background ,(solaryzed-color-blend blue base03 0.25))
|
|
|
|
|
;; )))
|
|
|
|
|
;; `(ediff-fine-diff-B ((,class (
|
|
|
|
|
;; :background ,(solarized-color-blend violet base03 0.25))
|
|
|
|
|
;; :background ,(solaryzed-color-blend violet base03 0.25))
|
|
|
|
|
;; )))
|
|
|
|
|
;; `(ediff-fine-diff-C ((,class (
|
|
|
|
|
;; :background ,(solarized-color-blend yellow base03 0.25))
|
|
|
|
|
;; :background ,(solaryzed-color-blend yellow base03 0.25))
|
|
|
|
|
;; )))
|
|
|
|
|
;; `(ediff-current-diff-A ((,class (
|
|
|
|
|
;; :background ,(solarized-color-blend blue base03 0.15)
|
|
|
|
|
;; :background ,(solaryzed-color-blend blue base03 0.15)
|
|
|
|
|
;; ))))
|
|
|
|
|
;; `(ediff-current-diff-B ((,class (
|
|
|
|
|
;; :background ,(solarized-color-blend violet base03 0.15)
|
|
|
|
|
;; :background ,(solaryzed-color-blend violet base03 0.15)
|
|
|
|
|
;; ))))
|
|
|
|
|
;; `(ediff-current-diff-C ((,class (
|
|
|
|
|
;; :background ,(solarized-color-blend yellow base03 0.15)
|
|
|
|
|
;; :background ,(solaryzed-color-blend yellow base03 0.15)
|
|
|
|
|
;; ))))
|
|
|
|
|
;; `(ediff-even-diff-A ((,class (
|
|
|
|
|
;; ;; :background ,(solarized-color-blend base0 base03 0.15)
|
|
|
|
|
;; ;; :background ,(solaryzed-color-blend base0 base03 0.15)
|
|
|
|
|
;; :background ,base02
|
|
|
|
|
;; ;; :foreground ,base2
|
|
|
|
|
;; ;; :background ,(solarized-color-blend green base02 0.15)
|
|
|
|
|
;; ;; :background ,(solaryzed-color-blend green base02 0.15)
|
|
|
|
|
;; ))))
|
|
|
|
|
;; `(ediff-even-diff-B ((,class (
|
|
|
|
|
;; ;; :background ,base01
|
|
|
|
@ -918,23 +918,23 @@ customize the resulting theme."
|
|
|
|
|
(,class (:foreground ,yellow-hc :background ,yellow-lc :weight bold :underline t))))
|
|
|
|
|
`(flycheck-info
|
|
|
|
|
((,(append '((supports :underline (:style wave))) class)
|
|
|
|
|
(:underline (:style wave :color ,(if solarized-emphasize-indicators
|
|
|
|
|
(:underline (:style wave :color ,(if solaryzed-emphasize-indicators
|
|
|
|
|
blue base03)) :inherit unspecified))
|
|
|
|
|
(,class (:foreground ,blue-hc :background ,blue-lc :weight bold :underline t))))
|
|
|
|
|
`(flycheck-fringe-error
|
|
|
|
|
((,class (:foreground ,(if solarized-emphasize-indicators
|
|
|
|
|
((,class (:foreground ,(if solaryzed-emphasize-indicators
|
|
|
|
|
red-hc red)
|
|
|
|
|
:background ,(if solarized-emphasize-indicators
|
|
|
|
|
:background ,(if solaryzed-emphasize-indicators
|
|
|
|
|
red-lc base03) :weight bold))))
|
|
|
|
|
`(flycheck-fringe-warning
|
|
|
|
|
((,class (:foreground ,(if solarized-emphasize-indicators
|
|
|
|
|
((,class (:foreground ,(if solaryzed-emphasize-indicators
|
|
|
|
|
yellow-hc yellow)
|
|
|
|
|
:background ,(if solarized-emphasize-indicators
|
|
|
|
|
:background ,(if solaryzed-emphasize-indicators
|
|
|
|
|
yellow-lc base03) :weight bold))))
|
|
|
|
|
`(flycheck-fringe-info
|
|
|
|
|
((,class (:foreground ,(if solarized-emphasize-indicators
|
|
|
|
|
((,class (:foreground ,(if solaryzed-emphasize-indicators
|
|
|
|
|
blue-hc base01)
|
|
|
|
|
:background ,(if solarized-emphasize-indicators
|
|
|
|
|
:background ,(if solaryzed-emphasize-indicators
|
|
|
|
|
blue-lc base03) :weight bold))))
|
|
|
|
|
;;;;; flymake
|
|
|
|
|
`(flymake-errline
|
|
|
|
@ -976,25 +976,25 @@ customize the resulting theme."
|
|
|
|
|
;;;;; git-gutter
|
|
|
|
|
`(git-gutter:added
|
|
|
|
|
((,class (:weight normal
|
|
|
|
|
:foreground ,(if solarized-emphasize-indicators
|
|
|
|
|
:foreground ,(if solaryzed-emphasize-indicators
|
|
|
|
|
green s-fringe-fg)
|
|
|
|
|
:background ,s-fringe-bg
|
|
|
|
|
))))
|
|
|
|
|
`(git-gutter:deleted
|
|
|
|
|
((,class (:weight normal
|
|
|
|
|
:foreground ,(if solarized-emphasize-indicators
|
|
|
|
|
:foreground ,(if solaryzed-emphasize-indicators
|
|
|
|
|
red s-fringe-fg)
|
|
|
|
|
:background ,s-fringe-bg
|
|
|
|
|
))))
|
|
|
|
|
`(git-gutter:modified
|
|
|
|
|
((,class (:weight normal
|
|
|
|
|
:foreground ,(if solarized-emphasize-indicators
|
|
|
|
|
:foreground ,(if solaryzed-emphasize-indicators
|
|
|
|
|
blue s-fringe-fg)
|
|
|
|
|
:background ,s-fringe-bg
|
|
|
|
|
))))
|
|
|
|
|
`(git-gutter:unchanged
|
|
|
|
|
((,class (:weight normal
|
|
|
|
|
:foreground ,(if solarized-emphasize-indicators
|
|
|
|
|
:foreground ,(if solaryzed-emphasize-indicators
|
|
|
|
|
base01 s-fringe-fg)
|
|
|
|
|
:background ,s-fringe-bg
|
|
|
|
|
))))
|
|
|
|
@ -1083,15 +1083,15 @@ customize the resulting theme."
|
|
|
|
|
`(go-guru-hl-identifier-face ((,class (:foreground ,magenta))))
|
|
|
|
|
;;;;; go-mode
|
|
|
|
|
`(go-coverage-0 ((,class (:foreground ,orange))))
|
|
|
|
|
`(go-coverage-1 ((,class (:foreground ,(solarized-color-blend blue yellow (/ 2.0 6))))))
|
|
|
|
|
`(go-coverage-2 ((,class (:foreground ,(solarized-color-blend blue yellow (/ 3.0 6))))))
|
|
|
|
|
`(go-coverage-3 ((,class (:foreground ,(solarized-color-blend blue yellow (/ 4.0 6))))))
|
|
|
|
|
`(go-coverage-4 ((,class (:foreground ,(solarized-color-blend blue yellow (/ 5.0 6))))))
|
|
|
|
|
`(go-coverage-1 ((,class (:foreground ,(solaryzed-color-blend blue yellow (/ 2.0 6))))))
|
|
|
|
|
`(go-coverage-2 ((,class (:foreground ,(solaryzed-color-blend blue yellow (/ 3.0 6))))))
|
|
|
|
|
`(go-coverage-3 ((,class (:foreground ,(solaryzed-color-blend blue yellow (/ 4.0 6))))))
|
|
|
|
|
`(go-coverage-4 ((,class (:foreground ,(solaryzed-color-blend blue yellow (/ 5.0 6))))))
|
|
|
|
|
`(go-coverage-5 ((,class (:foreground ,blue))))
|
|
|
|
|
`(go-coverage-6 ((,class (:foreground ,(solarized-color-blend cyan blue (/ 2.0 6))))))
|
|
|
|
|
`(go-coverage-7 ((,class (:foreground ,(solarized-color-blend cyan blue (/ 3.0 6))))))
|
|
|
|
|
`(go-coverage-8 ((,class (:foreground ,(solarized-color-blend cyan blue (/ 4.0 6))))))
|
|
|
|
|
`(go-coverage-9 ((,class (:foreground ,(solarized-color-blend cyan blue (/ 5.0 6))))))
|
|
|
|
|
`(go-coverage-6 ((,class (:foreground ,(solaryzed-color-blend cyan blue (/ 2.0 6))))))
|
|
|
|
|
`(go-coverage-7 ((,class (:foreground ,(solaryzed-color-blend cyan blue (/ 3.0 6))))))
|
|
|
|
|
`(go-coverage-8 ((,class (:foreground ,(solaryzed-color-blend cyan blue (/ 4.0 6))))))
|
|
|
|
|
`(go-coverage-9 ((,class (:foreground ,(solaryzed-color-blend cyan blue (/ 5.0 6))))))
|
|
|
|
|
`(go-coverage-10 ((,class (:foreground ,cyan))))
|
|
|
|
|
`(go-coverage-covered ((,class (:foreground ,green))))
|
|
|
|
|
`(go-coverage-untracked ((,class (:foreground ,base01))))
|
|
|
|
@ -1160,26 +1160,26 @@ customize the resulting theme."
|
|
|
|
|
`(helm-swoop-target-line-block-face ((,class (:foreground unspecified :background ,base02))))
|
|
|
|
|
`(helm-swoop-target-word-face ((,class (:foreground ,magenta :background unspecified))))
|
|
|
|
|
;;;;; hi-lock-mode
|
|
|
|
|
`(hi-yellow ((,class (:foreground ,(solarized-color-blend yellow base1 0.5)
|
|
|
|
|
:background,(solarized-color-blend yellow base03 0.15)))))
|
|
|
|
|
`(hi-pink ((,class (:foreground ,(solarized-color-blend magenta base1 0.5)
|
|
|
|
|
:background,(solarized-color-blend magenta base03 0.15)))))
|
|
|
|
|
`(hi-green ((,class (:foreground ,(solarized-color-blend green base1 0.5)
|
|
|
|
|
:background,(solarized-color-blend green base03 0.15)))))
|
|
|
|
|
`(hi-blue ((,class (:foreground ,(solarized-color-blend blue base1 0.5)
|
|
|
|
|
:background,(solarized-color-blend blue base03 0.15)))))
|
|
|
|
|
`(hi-yellow ((,class (:foreground ,(solaryzed-color-blend yellow base1 0.5)
|
|
|
|
|
:background,(solaryzed-color-blend yellow base03 0.15)))))
|
|
|
|
|
`(hi-pink ((,class (:foreground ,(solaryzed-color-blend magenta base1 0.5)
|
|
|
|
|
:background,(solaryzed-color-blend magenta base03 0.15)))))
|
|
|
|
|
`(hi-green ((,class (:foreground ,(solaryzed-color-blend green base1 0.5)
|
|
|
|
|
:background,(solaryzed-color-blend green base03 0.15)))))
|
|
|
|
|
`(hi-blue ((,class (:foreground ,(solaryzed-color-blend blue base1 0.5)
|
|
|
|
|
:background,(solaryzed-color-blend blue base03 0.15)))))
|
|
|
|
|
`(hi-black-b ((,class (:foreground ,base1
|
|
|
|
|
:background ,base03
|
|
|
|
|
:weight bold))))
|
|
|
|
|
`(hi-blue-b ((,class (:weight bold
|
|
|
|
|
:foreground ,(solarized-color-blend cyan base1 0.7)
|
|
|
|
|
:background ,(solarized-color-blend cyan base03 0.2)))))
|
|
|
|
|
:foreground ,(solaryzed-color-blend cyan base1 0.7)
|
|
|
|
|
:background ,(solaryzed-color-blend cyan base03 0.2)))))
|
|
|
|
|
`(hi-green-b ((,class (:weight bold
|
|
|
|
|
:foreground ,(solarized-color-blend green base1 0.7)
|
|
|
|
|
:background ,(solarized-color-blend green base03 0.2)))))
|
|
|
|
|
:foreground ,(solaryzed-color-blend green base1 0.7)
|
|
|
|
|
:background ,(solaryzed-color-blend green base03 0.2)))))
|
|
|
|
|
`(hi-red-b ((,class (:weight bold
|
|
|
|
|
:foreground ,(solarized-color-blend red base1 0.7)
|
|
|
|
|
:background ,(solarized-color-blend red base03 0.2)))))
|
|
|
|
|
:foreground ,(solaryzed-color-blend red base1 0.7)
|
|
|
|
|
:background ,(solaryzed-color-blend red base03 0.2)))))
|
|
|
|
|
`(hi-black-hb ((,class (:weight bold
|
|
|
|
|
:foreground ,base1
|
|
|
|
|
:background ,base02))))
|
|
|
|
@ -1441,11 +1441,11 @@ customize the resulting theme."
|
|
|
|
|
`(magit-diff-file-heading-selection ((t (:background ,base02
|
|
|
|
|
:foreground ,orange))))
|
|
|
|
|
`(magit-diff-hunk-heading
|
|
|
|
|
((t (:background ,(solarized-color-blend yellow base03 0.1)))))
|
|
|
|
|
((t (:background ,(solaryzed-color-blend yellow base03 0.1)))))
|
|
|
|
|
`(magit-diff-hunk-heading-highlight
|
|
|
|
|
((t (:background ,(solarized-color-blend yellow base02 0.1)))))
|
|
|
|
|
((t (:background ,(solaryzed-color-blend yellow base02 0.1)))))
|
|
|
|
|
`(magit-diff-hunk-heading-selection
|
|
|
|
|
((t (:background ,(solarized-color-blend yellow base02 0.1)
|
|
|
|
|
((t (:background ,(solaryzed-color-blend yellow base02 0.1)
|
|
|
|
|
:foreground ,orange
|
|
|
|
|
:weight bold))))
|
|
|
|
|
`(magit-diff-lines-heading ((t (:background ,orange
|
|
|
|
@ -1645,10 +1645,10 @@ customize the resulting theme."
|
|
|
|
|
`(nav-face-hfile ((,class (:foreground ,red))))
|
|
|
|
|
;;;;; nav-flash
|
|
|
|
|
;; `(nav-flash-face ((,class (:background ,base02))))
|
|
|
|
|
`(nav-flash-face ((,light-class (:foreground ,(solarized-color-blend yellow base1 0.2)
|
|
|
|
|
:background ,(solarized-color-blend yellow base03 0.2)))
|
|
|
|
|
(,dark-class (:foreground ,(solarized-color-blend cyan base1 0.1)
|
|
|
|
|
:background ,(solarized-color-blend cyan base03 0.3)))))
|
|
|
|
|
`(nav-flash-face ((,light-class (:foreground ,(solaryzed-color-blend yellow base1 0.2)
|
|
|
|
|
:background ,(solaryzed-color-blend yellow base03 0.2)))
|
|
|
|
|
(,dark-class (:foreground ,(solaryzed-color-blend cyan base1 0.1)
|
|
|
|
|
:background ,(solaryzed-color-blend cyan base03 0.3)))))
|
|
|
|
|
;;;;; navi2ch
|
|
|
|
|
`(navi2ch-list-category-face ((,class (:foreground ,blue ))))
|
|
|
|
|
`(navi2ch-list-add-board-name-face ((,class (:foreground ,yellow))))
|
|
|
|
@ -1713,7 +1713,7 @@ customize the resulting theme."
|
|
|
|
|
;;;;; org-mode
|
|
|
|
|
`(org-agenda-structure
|
|
|
|
|
((,class (:foreground ,base1 :background ,base02
|
|
|
|
|
:weight bold :slant normal :inverse-video nil :height ,solarized-height-plus-1
|
|
|
|
|
:weight bold :slant normal :inverse-video nil :height ,solaryzed-height-plus-1
|
|
|
|
|
:underline nil
|
|
|
|
|
:box (:line-width 2 :color ,base03)))))
|
|
|
|
|
`(org-agenda-calendar-event ((,class (:foreground ,base1))))
|
|
|
|
@ -1745,17 +1745,17 @@ customize the resulting theme."
|
|
|
|
|
`(org-headline-done ((,class (:foreground ,green))))
|
|
|
|
|
`(org-hide ((,class (:foreground ,base03))))
|
|
|
|
|
`(org-level-1 ((,class (:inherit ,s-variable-pitch :foreground ,orange
|
|
|
|
|
,@(when solarized-scale-org-headlines
|
|
|
|
|
(list :height solarized-height-plus-4))))))
|
|
|
|
|
,@(when solaryzed-scale-org-headlines
|
|
|
|
|
(list :height solaryzed-height-plus-4))))))
|
|
|
|
|
`(org-level-2 ((,class (:inherit ,s-variable-pitch :foreground ,green
|
|
|
|
|
,@(when solarized-scale-org-headlines
|
|
|
|
|
(list :height solarized-height-plus-3))))))
|
|
|
|
|
,@(when solaryzed-scale-org-headlines
|
|
|
|
|
(list :height solaryzed-height-plus-3))))))
|
|
|
|
|
`(org-level-3 ((,class (:inherit ,s-variable-pitch :foreground ,blue
|
|
|
|
|
,@(when solarized-scale-org-headlines
|
|
|
|
|
(list :height solarized-height-plus-2))))))
|
|
|
|
|
,@(when solaryzed-scale-org-headlines
|
|
|
|
|
(list :height solaryzed-height-plus-2))))))
|
|
|
|
|
`(org-level-4 ((,class (:inherit ,s-variable-pitch :foreground ,yellow
|
|
|
|
|
,@(when solarized-scale-org-headlines
|
|
|
|
|
(list :height solarized-height-plus-1))))))
|
|
|
|
|
,@(when solaryzed-scale-org-headlines
|
|
|
|
|
(list :height solaryzed-height-plus-1))))))
|
|
|
|
|
`(org-level-5 ((,class (:inherit ,s-variable-pitch
|
|
|
|
|
:foreground ,cyan))))
|
|
|
|
|
`(org-level-6 ((,class (:inherit ,s-variable-pitch
|
|
|
|
@ -1797,24 +1797,24 @@ customize the resulting theme."
|
|
|
|
|
`(org-column-title ((,class (:background ,base02 :underline t :weight bold))))
|
|
|
|
|
`(org-date-selected ((,class (:foreground ,red :inverse-video t))))
|
|
|
|
|
`(org-document-info ((,class (:foreground ,base0))))
|
|
|
|
|
`(org-document-title ((,class (:foreground ,base1 :weight bold :height ,solarized-height-plus-4))))
|
|
|
|
|
`(org-document-title ((,class (:foreground ,base1 :weight bold :height ,solaryzed-height-plus-4))))
|
|
|
|
|
`(org-drawer ((,class (:foreground ,cyan))))
|
|
|
|
|
`(org-footnote ((,class (:foreground ,magenta :underline t))))
|
|
|
|
|
`(org-latex-and-export-specials ((,class (:foreground ,orange))))
|
|
|
|
|
`(org-mode-line-clock-overrun ((,class (:inherit mode-line :background ,red))))
|
|
|
|
|
;;;;; outline
|
|
|
|
|
`(outline-1 ((,class (:inherit ,s-variable-pitch :foreground ,orange
|
|
|
|
|
,@(and solarized-scale-outline-headlines
|
|
|
|
|
(list :height solarized-height-plus-4))))))
|
|
|
|
|
,@(and solaryzed-scale-outline-headlines
|
|
|
|
|
(list :height solaryzed-height-plus-4))))))
|
|
|
|
|
`(outline-2 ((,class (:inherit ,s-variable-pitch :foreground ,green
|
|
|
|
|
,@(and solarized-scale-outline-headlines
|
|
|
|
|
(list :height solarized-height-plus-3))))))
|
|
|
|
|
,@(and solaryzed-scale-outline-headlines
|
|
|
|
|
(list :height solaryzed-height-plus-3))))))
|
|
|
|
|
`(outline-3 ((,class (:inherit ,s-variable-pitch :foreground ,blue
|
|
|
|
|
,@(and solarized-scale-outline-headlines
|
|
|
|
|
(list :height solarized-height-plus-2))))))
|
|
|
|
|
,@(and solaryzed-scale-outline-headlines
|
|
|
|
|
(list :height solaryzed-height-plus-2))))))
|
|
|
|
|
`(outline-4 ((,class (:inherit ,s-variable-pitch :foreground ,yellow
|
|
|
|
|
,@(when solarized-scale-outline-headlines
|
|
|
|
|
(list :height solarized-height-plus-1))))))
|
|
|
|
|
,@(when solaryzed-scale-outline-headlines
|
|
|
|
|
(list :height solaryzed-height-plus-1))))))
|
|
|
|
|
`(outline-5 ((,class (:inherit ,s-variable-pitch :foreground ,cyan))))
|
|
|
|
|
`(outline-6 ((,class (:inherit ,s-variable-pitch :foreground ,green))))
|
|
|
|
|
`(outline-7 ((,class (:inherit ,s-variable-pitch :foreground ,red))))
|
|
|
|
@ -1823,7 +1823,7 @@ customize the resulting theme."
|
|
|
|
|
`(outline-minor-0 ((,class (:weight bold :background ,s-base2))))
|
|
|
|
|
`(outline-minor-1
|
|
|
|
|
((,class (:inherit (outline-minor-0 outline-1)
|
|
|
|
|
:background ,(solarized-color-blend s-base3 yellow .9)))))
|
|
|
|
|
:background ,(solaryzed-color-blend s-base3 yellow .9)))))
|
|
|
|
|
;;;;; paren-face
|
|
|
|
|
`(paren-face ((,class (:foreground ,base01))))
|
|
|
|
|
;;;;; perspective
|
|
|
|
@ -1842,16 +1842,16 @@ customize the resulting theme."
|
|
|
|
|
`(popup-scroll-bar-foreground-face ((,class (:background ,base1))))
|
|
|
|
|
`(popup-tip-face ((,class (:background ,base02 :foreground ,base0))))
|
|
|
|
|
;;;;; powerline
|
|
|
|
|
`(powerline-active1 ((,class ,(if solarized-high-contrast-mode-line
|
|
|
|
|
`(powerline-active1 ((,class ,(if solaryzed-high-contrast-mode-line
|
|
|
|
|
`(:background ,base00 :foreground ,base03)
|
|
|
|
|
`(:background ,base03 :foreground ,base00)))))
|
|
|
|
|
`(powerline-active2 ((,class ,(if solarized-high-contrast-mode-line
|
|
|
|
|
`(powerline-active2 ((,class ,(if solaryzed-high-contrast-mode-line
|
|
|
|
|
`(:background ,base01 :foreground ,base03)
|
|
|
|
|
`(:background ,base02 :foreground ,base00)))))
|
|
|
|
|
`(powerline-inactive1 ((,class ,(if solarized-high-contrast-mode-line
|
|
|
|
|
`(powerline-inactive1 ((,class ,(if solaryzed-high-contrast-mode-line
|
|
|
|
|
`(:background ,base03 :foreground ,base1)
|
|
|
|
|
`(:background ,base02 :foreground ,base01)))))
|
|
|
|
|
`(powerline-inactive2 ((,class ,(if solarized-high-contrast-mode-line
|
|
|
|
|
`(powerline-inactive2 ((,class ,(if solaryzed-high-contrast-mode-line
|
|
|
|
|
`(:background ,base02 :foreground ,base1)
|
|
|
|
|
`(:background ,base03 :foreground ,base01)))))
|
|
|
|
|
;;;;; pretty-mode
|
|
|
|
@ -1934,11 +1934,11 @@ customize the resulting theme."
|
|
|
|
|
`(sml/charging ((,class (:foreground ,base1))))
|
|
|
|
|
`(sml/discharging ((,class (:foreground ,base1 :weight bold))))
|
|
|
|
|
;;;;; solaire
|
|
|
|
|
`(solaire-default-face ((,class (:inherit default :background ,(solarized-color-blend base02 base03 0.5)))))
|
|
|
|
|
`(solaire-minibuffer-face ((,class (:inherit default :background ,(solarized-color-blend base02 base03 0.5)))))
|
|
|
|
|
`(solaire-line-number-face ((,class (:inherit (line-number solaire-default-face) :background ,(solarized-color-blend base02 base03 0.5)))))
|
|
|
|
|
`(solaire-hl-line-face ((,class (:inherit hl-line :background ,(solarized-color-blend base02 base03 0.95)))))
|
|
|
|
|
`(solaire-org-hide-face ((,class (:inherit org-hide :background ,(solarized-color-blend base02 base03 0.5)))))
|
|
|
|
|
`(solaire-default-face ((,class (:inherit default :background ,(solaryzed-color-blend base02 base03 0.5)))))
|
|
|
|
|
`(solaire-minibuffer-face ((,class (:inherit default :background ,(solaryzed-color-blend base02 base03 0.5)))))
|
|
|
|
|
`(solaire-line-number-face ((,class (:inherit (line-number solaire-default-face) :background ,(solaryzed-color-blend base02 base03 0.5)))))
|
|
|
|
|
`(solaire-hl-line-face ((,class (:inherit hl-line :background ,(solaryzed-color-blend base02 base03 0.95)))))
|
|
|
|
|
`(solaire-org-hide-face ((,class (:inherit org-hide :background ,(solaryzed-color-blend base02 base03 0.5)))))
|
|
|
|
|
`(solaire-mode-line-face ((,class (:inherit default :background ,s-mode-line-bg))))
|
|
|
|
|
`(solaire-mode-line-inactive-face ((,class (:inherit default :background ,s-mode-line-inactive-bg))))
|
|
|
|
|
;;;;; smartparens
|
|
|
|
@ -2007,7 +2007,7 @@ customize the resulting theme."
|
|
|
|
|
;; TODO: sx-question-mode-content-faceexposes a general problem that's hard to deal with,
|
|
|
|
|
;; if base02 is used as bg some things are not visible enough.. It might be a good idea to
|
|
|
|
|
;; introduce yet another special color that goes a little furhter towards netural gray and
|
|
|
|
|
;; ensures readability as a bg for all solarized faces. If it's possible, that is.
|
|
|
|
|
;; ensures readability as a bg for all solaryzed faces. If it's possible, that is.
|
|
|
|
|
`(sx-question-mode-content-face ((,class (:background unspecified))))
|
|
|
|
|
`(sx-question-mode-date ((,class (:inherit font-lock-string-face))))
|
|
|
|
|
`(sx-question-mode-header ((,class (:inherit message-header-name :weight normal))))
|
|
|
|
@ -2048,13 +2048,13 @@ customize the resulting theme."
|
|
|
|
|
:weight normal))))
|
|
|
|
|
;;;;;; headings
|
|
|
|
|
`(sr-active-path-face ((,class (:background ,blue :foreground ,base03
|
|
|
|
|
:height ,solarized-height-plus-1 :weight bold))))
|
|
|
|
|
:height ,solaryzed-height-plus-1 :weight bold))))
|
|
|
|
|
`(sr-editing-path-face ((,class (:background ,yellow :foreground ,base03
|
|
|
|
|
:weight bold :height ,solarized-height-plus-1))))
|
|
|
|
|
:weight bold :height ,solaryzed-height-plus-1))))
|
|
|
|
|
`(sr-highlight-path-face ((,class (:background ,green :foreground ,base03
|
|
|
|
|
:weight bold :height ,solarized-height-plus-1))))
|
|
|
|
|
:weight bold :height ,solaryzed-height-plus-1))))
|
|
|
|
|
`(sr-passive-path-face ((,class (:background ,base01 :foreground ,base03
|
|
|
|
|
:weight bold :height ,solarized-height-plus-1))))
|
|
|
|
|
:weight bold :height ,solaryzed-height-plus-1))))
|
|
|
|
|
;;;;;; marked
|
|
|
|
|
`(sr-marked-dir-face ((,class (:inherit dired-marked))))
|
|
|
|
|
`(sr-marked-file-face ((,class (:inherit dired-marked))))
|
|
|
|
@ -2126,9 +2126,9 @@ customize the resulting theme."
|
|
|
|
|
:background ,red
|
|
|
|
|
:weight bold))))
|
|
|
|
|
`(transient-nonstandard-key
|
|
|
|
|
((t (:underline nil :background ,(solarized-color-blend yellow-l s-base3 0.2)))))
|
|
|
|
|
((t (:underline nil :background ,(solaryzed-color-blend yellow-l s-base3 0.2)))))
|
|
|
|
|
`(transient-mismatched-key
|
|
|
|
|
((t (:underline nil :background ,(solarized-color-blend red-l s-base3 0.2)))))
|
|
|
|
|
((t (:underline nil :background ,(solaryzed-color-blend red-l s-base3 0.2)))))
|
|
|
|
|
;;;;; tuareg
|
|
|
|
|
`(tuareg-font-lock-governing-face ((,class (:foreground ,magenta :weight bold))))
|
|
|
|
|
`(tuareg-font-lock-multistage-face ((,class (:foreground ,blue :background ,base02
|
|
|
|
@ -2260,7 +2260,7 @@ customize the resulting theme."
|
|
|
|
|
`(web-mode-javascript-comment-face ((,class (:inherit web-mode-comment-face))))
|
|
|
|
|
`(web-mode-json-comment-face ((,class (:inherit web-mode-comment-face))))
|
|
|
|
|
;;;;; weather-metno
|
|
|
|
|
`(weather-metno-date ((,class (:foreground ,yellow :height ,solarized-height-plus-3))))
|
|
|
|
|
`(weather-metno-date ((,class (:foreground ,yellow :height ,solaryzed-height-plus-3))))
|
|
|
|
|
`(weather-metno-date-range ((,class (:foreground ,blue))))
|
|
|
|
|
`(weather-metno-entry ((,class (:foreground ,cyan))))
|
|
|
|
|
`(weather-metno-footer ((,class (:inherit font-lock-comment-face))))
|
|
|
|
@ -2349,7 +2349,7 @@ customize the resulting theme."
|
|
|
|
|
;;;;; highlight-symbol
|
|
|
|
|
`(highlight-symbol-foreground-color ,base1)
|
|
|
|
|
`(highlight-symbol-colors
|
|
|
|
|
(--map (solarized-color-blend it ,base03 0.25)
|
|
|
|
|
(--map (solaryzed-color-blend it ,base03 0.25)
|
|
|
|
|
'(,yellow ,cyan ,red ,violet ,green ,orange ,blue)))
|
|
|
|
|
;;;;; highlight-tail
|
|
|
|
|
`(highlight-tail-colors
|
|
|
|
@ -2364,7 +2364,7 @@ customize the resulting theme."
|
|
|
|
|
`(pos-tip-foreground-color ,base1)
|
|
|
|
|
`(pos-tip-background-color ,base02)
|
|
|
|
|
;;;;; smartrep
|
|
|
|
|
`(smartrep-mode-line-active-bg (solarized-color-blend ,green ,s-mode-line-bg 0.2))
|
|
|
|
|
`(smartrep-mode-line-active-bg (solaryzed-color-blend ,green ,s-mode-line-bg 0.2))
|
|
|
|
|
;;;;; term
|
|
|
|
|
`(term-default-fg-color ,base0) ;; @deprecated24.3
|
|
|
|
|
`(term-default-bg-color ,base03) ;; @deprecated24.3
|
|
|
|
@ -2372,22 +2372,22 @@ customize the resulting theme."
|
|
|
|
|
`(vc-annotate-background-mode nil)
|
|
|
|
|
`(vc-annotate-color-map
|
|
|
|
|
'((20 . ,red)
|
|
|
|
|
(40 . ,(solarized-color-blend yellow red (/ 2.0 4)))
|
|
|
|
|
(60 . ,(solarized-color-blend yellow red (/ 3.0 4)))
|
|
|
|
|
(40 . ,(solaryzed-color-blend yellow red (/ 2.0 4)))
|
|
|
|
|
(60 . ,(solaryzed-color-blend yellow red (/ 3.0 4)))
|
|
|
|
|
(80 . ,yellow)
|
|
|
|
|
(100 . ,(solarized-color-blend green yellow (/ 2.0 6)))
|
|
|
|
|
(120 . ,(solarized-color-blend green yellow (/ 3.0 6)))
|
|
|
|
|
(140 . ,(solarized-color-blend green yellow (/ 4.0 6)))
|
|
|
|
|
(160 . ,(solarized-color-blend green yellow (/ 5.0 6)))
|
|
|
|
|
(100 . ,(solaryzed-color-blend green yellow (/ 2.0 6)))
|
|
|
|
|
(120 . ,(solaryzed-color-blend green yellow (/ 3.0 6)))
|
|
|
|
|
(140 . ,(solaryzed-color-blend green yellow (/ 4.0 6)))
|
|
|
|
|
(160 . ,(solaryzed-color-blend green yellow (/ 5.0 6)))
|
|
|
|
|
(180 . ,green)
|
|
|
|
|
(200 . ,(solarized-color-blend cyan green (/ 2.0 6)))
|
|
|
|
|
(220 . ,(solarized-color-blend cyan green (/ 3.0 6)))
|
|
|
|
|
(240 . ,(solarized-color-blend cyan green (/ 4.0 6)))
|
|
|
|
|
(260 . ,(solarized-color-blend cyan green (/ 5.0 6)))
|
|
|
|
|
(200 . ,(solaryzed-color-blend cyan green (/ 2.0 6)))
|
|
|
|
|
(220 . ,(solaryzed-color-blend cyan green (/ 3.0 6)))
|
|
|
|
|
(240 . ,(solaryzed-color-blend cyan green (/ 4.0 6)))
|
|
|
|
|
(260 . ,(solaryzed-color-blend cyan green (/ 5.0 6)))
|
|
|
|
|
(280 . ,cyan)
|
|
|
|
|
(300 . ,(solarized-color-blend blue cyan (/ 2.0 5)))
|
|
|
|
|
(320 . ,(solarized-color-blend blue cyan (/ 3.0 5)))
|
|
|
|
|
(340 . ,(solarized-color-blend blue cyan (/ 4.0 5)))
|
|
|
|
|
(300 . ,(solaryzed-color-blend blue cyan (/ 2.0 5)))
|
|
|
|
|
(320 . ,(solaryzed-color-blend blue cyan (/ 3.0 5)))
|
|
|
|
|
(340 . ,(solaryzed-color-blend blue cyan (/ 4.0 5)))
|
|
|
|
|
(360 . ,blue)))
|
|
|
|
|
`(vc-annotate-very-old-color nil)
|
|
|
|
|
`(vc-annotate-background nil)
|
|
|
|
@ -2410,7 +2410,7 @@ customize the resulting theme."
|
|
|
|
|
(when childtheme
|
|
|
|
|
(funcall childtheme))
|
|
|
|
|
) ; END custom-theme-set-variables
|
|
|
|
|
) ; END defun create-solarized-theme
|
|
|
|
|
) ; END defun create-solaryzed-theme
|
|
|
|
|
|
|
|
|
|
;;; Footer
|
|
|
|
|
|
|
|
|
@ -2419,7 +2419,7 @@ customize the resulting theme."
|
|
|
|
|
(add-to-list 'custom-theme-load-path
|
|
|
|
|
(file-name-as-directory (file-name-directory load-file-name))))
|
|
|
|
|
|
|
|
|
|
(provide 'solarized)
|
|
|
|
|
(provide 'solaryzed)
|
|
|
|
|
|
|
|
|
|
;; Local Variables:
|
|
|
|
|
;; no-byte-compile: t
|
|
|
|
@ -2427,4 +2427,4 @@ customize the resulting theme."
|
|
|
|
|
;; indent-tabs-mode: nil
|
|
|
|
|
;; fill-column: 95
|
|
|
|
|
;; End:
|
|
|
|
|
;;; solarized.el ends here
|
|
|
|
|
;;; solaryzed.el ends here
|
|
|
|
|