* themes/adwaita-theme.el: New file.

4 files changed, 117 insertions, 6 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 431debda50..5212980358 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,7 +1,11 @@
+2011-09-13  William Stevenson  <[email protected]>
+
+	* themes/adwaita-theme.el: New file.
+
 2011-09-13  Scott Frazer  <[email protected]>
 
 	* themes/whiteboard-theme.el:
-	* themes/deeper-blue-theme.el (deeper-blue): New files.
+	* themes/deeper-blue-theme.el: New files.
 
 2011-09-05  Juri Linkov  <[email protected]>
 
diff --git a/etc/themes/adwaita-theme.el b/etc/themes/adwaita-theme.el
new file mode 100644
index 0000000000..9e991847d5
--- /dev/null
+++ b/etc/themes/adwaita-theme.el
@@ -0,0 +1,106 @@
+;;; adwaita-theme.el --- Tango-based custom theme for faces
+
+;; Copyright (C) 2010-2011 Free Software Foundation, Inc.
+
+;; Author: William Stevenson <[email protected]>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(deftheme adwaita
+  "Face colors similar to the default theme of Gnome 3 (Adwaita).
+The colors are chosen to match Adwaita window decorations and the
+default look of the Gnome 3 desktop.")
+
+(let ((class '((class color) (min-colors 89))))
+  (custom-theme-set-faces
+   'adwaita
+   `(cursor ((,class (:background "#00BBFF"))))
+   `(border-color ((,class (:background "#EDEDED"))))
+   `(default ((,class (:background "#EDEDED" :foreground "#2E3436"))))
+   `(fringe ((,class (:background "#E6E6E6"))))
+   `(mode-line ((,class (:box (:line-width -1 :style released-button)
+			 :background "white" :foreground "#2E3436"))))
+   `(mode-line-inactive ((,class (:foreground "#C6C6C6" :background ,"white"))))
+   `(header-line ((,class (:foreground "#CCCCCC" :background "black"))))
+
+   `(minibuffer-prompt ((,class (:foreground "#0084C8" :bold t))))
+   `(region ((,class (:foreground unspecified :background "#C2D5E9"))))
+   `(dired-header ((,class (:bold t :foreground "#0084C8"))))
+   `(widget-button ((,class (:bold t :foreground "#0084C8"))))
+
+   `(success ((,class (:bold t :foreground "#4E9A06"))))
+   `(warning ((,class (:foreground "#CE5C00"))))
+   `(error ((,class (:foreground "#B50000"))))
+
+   `(font-lock-builtin-face ((,class (:foreground "#A020F0"))))
+   `(font-lock-constant-face ((,class (:foreground "#F5666D"))))
+   `(font-lock-comment-face ((,class (:foreground "#204A87"))))
+   `(font-lock-function-name-face ((,class (:foreground "#00578E" :bold t))))
+   `(font-lock-keyword-face ((,class (:bold t :foreground "#A52A2A"))))
+   `(font-lock-string-face ((,class (:foreground "#4E9A06"))))
+   `(font-lock-type-face ((,class (:foreground "#2F8B58" :bold t))))
+   `(font-lock-variable-name-face ((,class (:foreground "#0084C8" :bold t))))
+   `(font-lock-warning-face ((,class (:foreground "#F5666D" :bold t))))
+
+   `(link ((,class (:underline t :foreground "#0066CC"))))
+   `(link-visited ((,class (:underline t :foreground "#6799CC"))))
+   `(highlight ((,class (:foreground "white" :background "#4A90D9"))))
+   `(isearch ((,class (:foreground "white" :background "#77A4DD"))))
+
+   `(erc-action-face ((,class (:foreground "#F5666D"))))
+   `(erc-button ((,class (:foreground "#A8799C"))))
+   `(erc-current-nick-face ((,class (:bold t :foreground "#FF7092"))))
+   `(erc-error-face ((,class (:foreground "#F5666D" :bold t))))
+   `(erc-input-face ((,class (:foreground "black"))))
+   `(erc-keyword-face ((,class (:foreground "#F5666D"))))
+   `(erc-my-nick-face ((,class (:bold t :foreground "#FF8CA7"))))
+   `(erc-nick-default-face ((,class (:bold t :foreground "#0084C8"))))
+   `(erc-notice-face ((,class (:foreground "#0084C8"))))
+   `(erc-prompt-face ((,class (:foreground "black"))))
+   `(erc-timestamp-face ((,class (:foreground ,"#4CB64A"))))
+
+   `(magit-log-sha1 ((,class (:foreground "#FF7092"))))
+   `(magit-log-head-label-local ((,class (:foreground "#4F78B5"))))
+   `(magit-log-head-label-remote ((,class (:foreground ,"#4CB64A"))))
+   `(magit-branch ((,class (:bold t :foreground "#0084C8"))))
+   `(magit-section-title ((,class (:bold t :foreground "#00578E"))))
+   `(magit-item-highlight ((,class (:background "#FEFFBF"))))
+   `(magit-diff-add ((,class (:bold t :foreground "#4CB64A"))))
+   `(magit-diff-del ((,class (:bold nil :foreground "#F5666D"))))
+
+   `(gnus-group-mail-1-empty ((,class (:foreground "#00578E"))))
+   `(gnus-group-mail-1 ((,class (:bold t :foreground "#4F78B5"))))
+   `(gnus-group-mail-3-empty ((,class (:foreground "#00578E"))))
+   `(gnus-group-mail-3 ((,class (:bold t :foreground "#9CBB43"))))
+   `(gnus-group-news-3-empty ((,class (:foreground "#00578E"))))
+   `(gnus-group-news-3 ((,class (:bold t :foreground "#9CBB43"))))
+   `(gnus-header-name ((,class (:bold t :foreground "#0084C8"))))
+   `(gnus-header-subject ((,class (:bold t :foreground "#FF7092"))))
+   `(gnus-header-content ((,class (:foreground "#FF7092"))))
+   `(gnus-button ((,class (:bold t :foreground "#00578E"))))
+   `(gnus-cite-1 ((,class (:foreground "#00578E"))))
+   `(gnus-cite-2 ((,class (:foreground "#0084C8"))))
+
+   `(diff-added ((,class (:bold t :foreground "#4E9A06"))))
+   `(diff-removed ((,class (:bold t :foreground "#F5666D"))))))
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
+;;; adwaita-theme.el  ends here
diff --git a/etc/themes/deeper-blue-theme.el b/etc/themes/deeper-blue-theme.el
index 2430954e4a..5c93e84d07 100644
--- a/etc/themes/deeper-blue-theme.el
+++ b/etc/themes/deeper-blue-theme.el
@@ -35,7 +35,6 @@
    `(compilation-error ((,class (:foreground "Red1"))))
    `(compilation-info ((,class (:weight normal :foreground "LightSkyBlue"))))
    `(compilation-line-number ((,class (:foreground "LightGreen"))))
-   `(compilation-warning ((,class (:foreground "Yellow"))))
    `(cperl-array-face ((,class (:foreground "yellow2"))))
    `(cperl-hash-face ((,class (:foreground "coral1"))))
    `(cursor ((,class (:background "green" :foreground "black"))))
@@ -60,6 +59,7 @@
    `(ediff-fine-diff-A ((,class (:background "skyblue4" :foreground "white"))))
    `(ediff-fine-diff-B ((,class (:background "cyan4" :foreground "white"))))
    `(ediff-odd-diff-A ((,class (:background "Grey50" :foreground "White"))))
+   `(error ((,class (:foreground "red"))))
    `(flymake-errline ((,class (:background nil :underline "red"))))
    `(flymake-warnline ((,class (:background nil :underline "magenta3"))))
    `(font-lock-builtin-face ((,class (:foreground "LightCoral"))))
@@ -77,7 +77,6 @@
    `(font-lock-string-face ((,class (:foreground "burlywood"))))
    `(font-lock-type-face ((,class (:foreground "CadetBlue1"))))
    `(font-lock-variable-name-face ((,class (:foreground "SeaGreen2"))))
-   `(font-lock-warning-face ((,class (:foreground "red"))))
    `(fringe ((,class (:background "black"))))
    `(highlight ((,class (:background "DodgerBlue4"))))
    `(ido-first-match ((,class (:weight normal :foreground "orange"))))
@@ -104,7 +103,9 @@
    `(primary-selection ((,class (:background "blue3"))))
    `(region ((,class (:background "#103050"))))
    `(show-paren-match-face ((,class (:background "dodgerblue1" :foreground "white"))))
-   `(show-paren-mismatch-face ((,class (:background "red1" :foreground "white"))))))
+   `(show-paren-mismatch-face ((,class (:background "red1" :foreground "white"))))
+   `(success ((,class (:foreground "SeaGreen2"))))
+   `(warning ((,class (:foreground "Yellow"))))))
 
 (provide-theme 'deeper-blue)
 
diff --git a/etc/themes/whiteboard-theme.el b/etc/themes/whiteboard-theme.el
index ca492b4e74..e0fa7ff7ff 100644
--- a/etc/themes/whiteboard-theme.el
+++ b/etc/themes/whiteboard-theme.el
@@ -35,7 +35,6 @@
    `(compilation-error ((,class (:foreground "Red1"))))
    `(compilation-info ((,class (:weight normal :foreground "DeepSkyBlue4"))))
    `(compilation-line-number ((,class (:foreground "DarkGreen"))))
-   `(compilation-warning ((,class (:foreground "Yellow4"))))
    `(cperl-array-face ((,class (:foreground "SlateBlue3"))))
    `(cperl-hash-face ((,class (:foreground "turquoise3"))))
    `(cperl-nonoverridable-face ((,class (:foreground "orchid3"))))
@@ -86,7 +85,8 @@
    `(primary-selection ((,class (:background "blue3"))))
    `(region ((,class (:background "SkyBlue1"))))
    `(show-paren-match-face ((,class (:background "dodgerblue1" :foreground "white"))))
-   `(show-paren-mismatch-face ((,class (:background "red1" :foreground "white"))))))
+   `(show-paren-mismatch-face ((,class (:background "red1" :foreground "white"))))
+   `(warning ((,class (:foreground "Yellow4"))))))
 
 (provide-theme 'whiteboard)