From d9323f0c017dddccfc0a107690736477527ea33f Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Tue, 23 Apr 2013 00:29:39 +0200
Subject: [PATCH] Use yoshi colors in style

Still in transition
---
 .conkerorrc/styles/base.less   |  4 +-
 .conkerorrc/styles/github.less | 75 +++++++++++++++++-----------------
 .conkerorrc/styles/yoshi.less  | 24 +++++++++++
 3 files changed, 65 insertions(+), 38 deletions(-)
 create mode 100644 .conkerorrc/styles/yoshi.less

diff --git a/.conkerorrc/styles/base.less b/.conkerorrc/styles/base.less
index dcb5a5e..410efe2 100644
--- a/.conkerorrc/styles/base.less
+++ b/.conkerorrc/styles/base.less
@@ -1,4 +1,6 @@
 @import "tango";
+@import "yoshi";
 
 @monospace-font: "Envy Code R";
-@background: #111113;
+@background: @dblack;
+@foreground: @lwhite;
diff --git a/.conkerorrc/styles/github.less b/.conkerorrc/styles/github.less
index e4d3ed0..316d005 100644
--- a/.conkerorrc/styles/github.less
+++ b/.conkerorrc/styles/github.less
@@ -3,25 +3,25 @@
 @-moz-document url("https://github.com/"), url("https://github.com/dashboard") {
     #dashboard {
         .filter-bar {
-            background: @aluminium-5 !important;
-            border-bottom: none !important;
+            background: @dblack !important;
+            border-bottom-color: @dwhite !important;
 
             li a.filter_selected {
-                color: @aluminium-1 !important;
+                color: @dwhite !important;
             }
         }
 
         .repos {
-            border: none !important;
-            background-color: @aluminium-6 !important;
+            border-color: @dwhite !important;
+            background-color: @dblack !important;
 
             .bottom-bar {
-                background-color: @aluminium-5 !important;
+                background-color: @dblack !important;
             }
 
             .top-bar {
-                background: @aluminium-5 !important;
-                border-bottom: none !important;
+                background: @dblack !important;
+                border-bottom-color: @dwhite !important;
             }
 
             h2 {
@@ -31,7 +31,7 @@
 
         ul.repo_list li {
             &.private {
-                background: @aluminium-5 !important;
+                background: @dwhite !important;
             }
 
             a {
@@ -45,48 +45,48 @@
     }
 
     .button .minibutton {
-        background: @aluminium-6 !important;
+        background: @dblack !important;
     }
 
     .header {
-        background: @aluminium-5 !important;
-        color: @aluminium-1 !important;
-        border-bottom: none !important;
+        background: @dwhite !important;
+        color: @lblack !important;
+        border-bottom-color: @dblack !important;
         text-shadow: none !important;
 
         .divider-vertical {
-            background: @aluminium-5 !important;
-            border-right: none !important;
+            background: @dblack !important;
+            border-right-color: @dwhite !important;
         }
 
         .top-nav a,
         .topsearch a#advanced_search,
         #user-links a {
-            color: @aluminium-1 !important;
+            color: @lblack !important;
         }
     }
 
     .markdown-body {
         code, tt {
-            background-color: @aluminium-5 !important;
-            border: none !important;
-            color: @aluminium-1 !important;
+            background-color: @dwhite !important;
+            border-color: @dblack !important;
+            color: @lblack !important;
             font-family: @monospace-font !important;
         }
     }
 
     .minibutton.dark-grey {
-        backgrond: @aluminium-6 !important;
+        backgrond: @dwhite !important;
     }
 
     .news {
         .alert {
-            border-top: none !important;
+            border-top-color: @dwhite !important;
 
             .branch-info,
             .pull-info {
-                background: @aluminium-5 !important;
-                color: @aluminium-1 !important;
+                background: @dblack !important;
+                color: @lblack !important;
             }
 
             .gravatar {
@@ -94,7 +94,7 @@
             }
 
             .simple .title {
-                color: @aluminium-1 !important;
+                color: @lblack !important;
             }
         }
 
@@ -103,12 +103,12 @@
         }
 
         blockquote {
-            color: @aluminium-1 !important;
+            color: @lblack !important;
         }
     }
 
     .pagehead .container > ul.tabs {
-        background: @aluminium-6 !important;
+        background: @dblack !important;
         border: none !important;
 
         li a {
@@ -117,46 +117,47 @@
 
             &:hover,
             &.selected {
-                background: @aluminium-5 !important;
+                background: @dwhite !important;
             }
         }
     }
 
     .pagehead-actions a.feed {
-        background: @aluminium-5 !important;
-        border: none !important;
+        background: @dwhite !important;
+        border: @dblack !important;
+        color: @lorange !important;
     }
 
     .pagination {
-        background: @aluminium-6 !important;
-        border: none !important;
+        background: @dwhite !important;
+        border-color: @dblack !important;
 
         a {
             text-shadow: none !important;
-            border-bottom: none !important;
+            border-bottom-color: @dwhite !important;
 
             &:hover {
-                background: @aluminium-5 !important;
+                background: @dblack !important;
             }
         }
     }
 
     a {
-        color: @orange-1 !important;
+        color: @lorange !important;
 
         &:visited {
-            color: @plum-1 !important;
+            color: @lmagenta !important;
         }
 
         &.header-logo-blacktocat {
             &, &:visited {
-                color: @aluminium-1 !important;
+                color: @dwhite !important;
             }
         }
     }
 
     body {
         background-color: @background !important;
-        color: @aluminium-1 !important;
+        color: @foreground !important;
     }
 }
diff --git a/.conkerorrc/styles/yoshi.less b/.conkerorrc/styles/yoshi.less
new file mode 100644
index 0000000..5fdac7e
--- /dev/null
+++ b/.conkerorrc/styles/yoshi.less
@@ -0,0 +1,24 @@
+@lblack: #ededed;
+@dblack: #111111;
+@lwhite: #bfbfbf;
+@dwhite: #404040;
+@lred: #bf7d7d;
+@dred: #402929;
+@lorange: #bfa47d;
+@dorange: #403729;
+@lyellow: #b2bf7d;
+@dyellow: #3b4029;
+@lgreen: #8abf6d;
+@dgreen: #2d4029;
+@lturquoise: #7dbf97;
+@dturquoise: #294032;
+@lcyan: #7dbfbf;
+@dcyan: #294040;
+@lblue: #6d97bf;
+@dblue: #293240;
+@lpurple: #8a7dbf;
+@dpurple: #2d2940;
+@lmagenta: #b27dbf;
+@dmagenta: #3b2940;
+@lpink: #bf6da4;
+@dpink: #402937;