Merge remote-tracking branch 'ryuslash/master' into phoenix

Conflicts:
	.config/awesome/rc.lua
	.emacs.d/init.el
	.emacs.d/init.org
	.emacs.d/site-lisp/oni.el

3 files changed, 184 insertions, 0 deletions

diff --git a/.conkerorrc/styles/Makefile b/.conkerorrc/styles/Makefile
new file mode 100644
index 0000000..fb44500
--- /dev/null
+++ b/.conkerorrc/styles/Makefile
@@ -0,0 +1,4 @@
+DESTDIR:=$(DESTDIR)/styles
+objects=github.css help.css
+
+include ../../dotfiles.mk
diff --git a/.conkerorrc/styles/github.css b/.conkerorrc/styles/github.css
new file mode 100644
index 0000000..ff3a643
--- /dev/null
+++ b/.conkerorrc/styles/github.css
@@ -0,0 +1,161 @@
+@-moz-document url(https://github.com/), url(https://github.com/dashboard) {
+    #dashboard .filter-bar {
+        background: #222224 !important;
+        border-bottom: none !important;
+    }
+
+    #dashboard .filter-bar li a.filter_selected {
+        color: #eeeeec !important;
+    }
+
+    #dashboard .repos {
+        border: none !important;
+        background-color: #171719 !important;
+    }
+
+    #dashboard .repos .bottom-bar {
+        background-color: #222224 !important;
+    }
+
+    #dashboard .repos .top-bar {
+        background: #222224 !important;
+        border-bottom: none !important;
+    }
+
+    #dashboard .repos h2 {
+        color: inherit !important;
+    }
+
+    #dashboard ul.repo_list li.private {
+        background: #222224 !important;
+    }
+
+    #dashboard ul.repo_list li a {
+        border-width: 0 !important;
+    }
+
+    #footer {
+        text-shadow: none !important;
+    }
+
+    .button .minibutton {
+        background: #171719 !important;
+    }
+
+    .header {
+        background: #222224 !important;
+        color: #eeeeec !important;
+        border-bottom: none !important;
+        text-shadow: none !important;
+    }
+
+    .header .divider-vertical {
+        background: #222224 !important;
+        border-right: none !important;
+    }
+
+    .header .top-nav a {
+        color: #eeeeec !important;
+    }
+
+    .header .topsearch a#advanced_search {
+        color: #eeeeec !important;
+    }
+
+    .header #user-links a {
+        color: #eeeeec !important;
+    }
+
+    .markdown-body code,
+    .markdown-body tt {
+        background-color: #222224 !important;
+        border: none !important;
+        color: #eeeeec !important;
+        font-family: "Envy Code R" !important;
+    }
+
+    .minibutton.dark-grey {
+        background: #171719 !important;o
+    }
+
+    .news .alert {
+        border-top: none !important;
+    }
+
+    .news .alert .branch-link,
+    .news .alert .pull-info {
+        background: #222224 !important;
+        color: #eeeeec !important;
+    }
+
+    .news .alert .gravatar {
+        background: none !important;
+    }
+
+    .news .alert .simple .title {
+        color: #eeeeec !important;
+    }
+
+    .news .commits li img {
+        background: none !important;
+    }
+
+    .news blockquote {
+        color: #eeeeec !important;
+    }
+
+    .pagehead .container > ul.tabs {
+        background: #171719 !important;
+        border: none !important;
+    }
+
+    .pagehead .container > ul.tabs li a {
+        text-shadow: none !important;
+        border: none !important;
+    }
+
+    .pagehead .container > ul.tabs li a:hover {
+        background: #222224 !important;
+    }
+
+    .pagehead .container > ul.tabs li a.selected {
+        background: #222224 !important;
+    }
+
+    .pagehead-actions a.feed {
+        background: #222224 !important;
+        border: none !important;
+    }
+
+    .pagination {
+        background: #171719 !important;
+        border: none !important;
+    }
+
+    .pagination a {
+        text-shadow: none !important;
+        border-bottom: none !important;
+    }
+
+    .pagination a:hover {
+        background: #222224 !important;
+    }
+
+    a {
+        color: #ffbb56 !important;
+    }
+
+    a:visited {
+        color: #ee82ee !important;
+    }
+
+    a.header-logo-blacktocat,
+    a.header-logo-blacktocat:visited {
+        color: #eeeeec !important;
+    }
+
+    body {
+        background-color: #111113 !important;
+        color: #eeeeec !important;
+    }
+}
diff --git a/.conkerorrc/styles/help.css b/.conkerorrc/styles/help.css
new file mode 100644
index 0000000..03888b6
--- /dev/null
+++ b/.conkerorrc/styles/help.css
@@ -0,0 +1,19 @@
+@-moz-document url(chrome://conkeror-help/content/help.html) {
+    body {
+        background: #111113 !important;
+        color: #eeeeec !important;
+    }
+
+    a {
+        color: #ffbb56 !important;
+    }
+
+    a:visited {
+        color: #ee82ee !important;
+    }
+
+    pre, .key {
+        background: #222224 !important;
+        font-family: "Envy Code R" !important;
+    }
+}