Copy pastels-on-dark-theme into local repo

diff --git a/.gitmodules b/.gitmodules
index 6fb1086f3e0664ef5c6d3f781335042d4c9b298b..58d56eda677ac2ac2a940c05ffc227bfa3d2350a 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -67,9 +67,6 @@
 [submodule "dockerfile-mode"]
        path = packages/dockerfile-mode
        url = https://github.com/spotify/dockerfile-mode.git
 [submodule "dockerfile-mode"]
        path = packages/dockerfile-mode
        url = https://github.com/spotify/dockerfile-mode.git

-[submodule "pastels-on-dark-theme"]
-       path = packages/pastels-on-dark-theme
-       url = https://gist.github.com/1906662.git

 [submodule "markdown-mode"]
        path = packages/markdown-mode
        url = https://github.com/jrblevin/markdown-mode.git
 [submodule "markdown-mode"]
        path = packages/markdown-mode
        url = https://github.com/jrblevin/markdown-mode.git

diff --git a/lisp/my-gui.el b/lisp/my-gui.el
index 01d2067db75b18096eff69e4f0efbb361f301a3f..9c3dce1cd8db56e68de758b139261f23fc37ee79 100644 (file)
--- a/lisp/my-gui.el
+++ b/lisp/my-gui.el
@@ -1,11 +1,11 @@
 ;;; -*- lexical-binding: t -*-
 
 (require 'pastels-on-dark-theme)
 ;;; -*- lexical-binding: t -*-
 
 (require 'pastels-on-dark-theme)

-(face-spec-set 'region '((t (:background "#822A31"))))
+(setq frame-background-mode 'dark)

 
 (setq default-frame-alist '((vertical-scroll-bars)
                             (background-mode . dark)
 
 (setq default-frame-alist '((vertical-scroll-bars)
                             (background-mode . dark)

-                            (alpha . 90)
+                            (alpha . 95)

                             (font . "monospace 11")))
 
 (require 'ansi-color)
                             (font . "monospace 11")))
 
 (require 'ansi-color)

diff --git a/lisp/pastels-on-dark-theme.el b/lisp/pastels-on-dark-theme.el
new file mode 100644 (file)
index 0000000..4d51d46
--- /dev/null
+++ b/lisp/pastels-on-dark-theme.el
@@ -0,0 +1,73 @@
+;;; pastels-on-dark-theme.el --- Pastels on Dark theme for Emacs 24
+
+;; Author: Mats Persson
+;; Maintainer: Shane Celis <shane (at) gnufoo (dot) org>
+;; URL: http://gist.github.com/1906662
+;; Version: 0.3
+;; Keywords: theme, color
+
+;;; Commentary:
+
+;; Pastels on Dark was created by Mats Persson and popularized in
+;; TextMate.app.  Ported to Emacs 24 by Shane Celis because I love it!
+
+;; To install the theme, M-x `load-theme' then enter
+;; `pastels-on-dark'.  If you run into any issues, check the
+;; `custom-theme-load-path' variable.
+
+
+;;; Code:
+
+(deftheme pastels-on-dark
+  "Pastels on Dark created by Mats Persson and popularized in TextMate.app.  Ported to Emacs 24 by Shane Celis because I love it!")
+
+(custom-theme-set-faces
+ 'pastels-on-dark
+ '(cursor ((t (:background "#FFFFFF"))))
+ '(escape-glyph ((t (:foreground "#47B8D6"))))
+ '(minibuffer-prompt ((t (:foreground "#47B8D6"))))
+ '(highlight ((t (:background "#262626"))))
+ '(region ((t (:background "#322A31"))))
+ '(shadow ((t (:foreground "#555555"))))
+ '(secondary-selection ((t (:background "#463849"))))
+ '(trailing-whitespace ((t (:background "#FFD0D0"))))
+ '(font-lock-builtin-face ((t (:foreground "#7171F3" :weight bold))))
+ '(font-lock-comment-delimiter-face ((t (:foreground "#ed5b15" :inherit font-lock-comment-face))))
+ '(font-lock-comment-face ((t (:foreground "#ed5b15"))))
+ '(font-lock-constant-face ((t (:foreground "#DF7921" :weight bold))))
+ '(font-lock-function-name-face ((t (:foreground "#A1A1FF"))))
+ '(font-lock-keyword-face ((t (:foreground "#4856F7" :weight bold))))
+ '(font-lock-preprocessor-face ((t (:foreground "#4856F7"))))
+ '(font-lock-regexp-grouping-backslash ((t (:inherit bold :foreground "#666666"))))
+ '(font-lock-regexp-grouping-construct ((t (:inherit bold :foreground "#666666"))))
+ '(font-lock-string-face ((t (:foreground "#A2925E"))))
+ '(font-lock-type-face ((t (:foreground "#DADADA"))))
+ '(font-lock-variable-name-face ((t (:foreground "#C1C144"))))
+ '(font-lock-warning-face ((t (:foreground "#EC9E00"))))
+ '(link ((t (:foreground "#0066FF" :underline t))))
+ '(link-visited ((t (:inherit link :foreground "#FF0066"))))
+ '(fringe ((t nil)))
+ '(mode-line-highlight ((t (:box (:line-width 2 :color "grey40" :style released-button)))))
+ '(isearch ((t (:background "#463849" :foreground "#ffffff" :weight bold))))
+ '(compilation-error ((t (:inherit error))))
+ '(error ((t (:foreground "#B20006" :weight bold))))
+ '(warning ((t (:foreground "#FF8000" :weight bold))))
+ '(success ((t (:foreground "#00DD00" :weight bold))))
+ '(compilation-line-number ((t (:foreground "#EC9E00"))))
+ '(glyphless-char ((t (:background "#4F4D4D"))))
+ '(lazy-highlight ((t (:background "#302733"))))
+ '(default ((t (:stipple nil :background "#211D1D" :foreground "#DADADA" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :width normal)))))
+
+
+;;;###autoload
+(when load-file-name
+  (add-to-list 'custom-theme-load-path
+               (file-name-as-directory (file-name-directory load-file-name))))
+
+(provide-theme 'pastels-on-dark)
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
+;;; pastels-on-dark-theme.el ends here
\ No newline at end of file

diff --git a/packages/pastels-on-dark-theme b/packages/pastels-on-dark-theme
deleted file mode 160000 (submodule)
index 1473aee..0000000
--- a/packages/pastels-on-dark-theme
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1473aee65d2039a3ba291e1a4e0cd117b5d278f3