From 034016e330153592af5a6b7943d225b728859bc6 Mon Sep 17 00:00:00 2001
From: Hakim El Hattab <hakim.elhattab@gmail.com>
Date: Mon, 4 Mar 2013 17:54:59 -0500
Subject: [PATCH] merge two new themes, slight adjustments to said themes

---
 Gruntfile.js                                  |  4 ++-
 css/theme/{solarized_dark.css => moon.css}    | 10 +++---
 .../{solarized_light.css => solarized.css}    | 32 +++++++++----------
 .../source/{solarized_dark.scss => moon.scss} | 23 ++++++++++---
 .../{solarized_light.scss => solarized.scss}  | 23 ++++++++++---
 css/theme/source/solarized_colors.scss        | 17 ----------
 6 files changed, 62 insertions(+), 47 deletions(-)
 rename css/theme/{solarized_dark.css => moon.css} (90%)
 rename css/theme/{solarized_light.css => solarized.css} (83%)
 rename css/theme/source/{solarized_dark.scss => moon.scss} (76%)
 rename css/theme/source/{solarized_light.scss => solarized.scss} (77%)
 delete mode 100644 css/theme/source/solarized_colors.scss

diff --git a/Gruntfile.js b/Gruntfile.js
index ac6382d5..bb3cc35d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -50,7 +50,9 @@ module.exports = function(grunt) {
 					'css/theme/night.css': 'css/theme/source/night.scss',
 					'css/theme/serif.css': 'css/theme/source/serif.scss',
 					'css/theme/simple.css': 'css/theme/source/simple.scss',
-					'css/theme/sky.css': 'css/theme/source/sky.scss'
+					'css/theme/sky.css': 'css/theme/source/sky.scss',
+					'css/theme/moon.css': 'css/theme/source/moon.scss',
+					'css/theme/solarized.css': 'css/theme/source/solarized.scss'
 				}
 			},
 		},
diff --git a/css/theme/solarized_dark.css b/css/theme/moon.css
similarity index 90%
rename from css/theme/solarized_dark.css
rename to css/theme/moon.css
index b5bb6242..24c1d7b7 100644
--- a/css/theme/solarized_dark.css
+++ b/css/theme/moon.css
@@ -25,11 +25,11 @@ body {
   background-color: #002b36; }
 
 .reveal {
-  font-family: "Lato", Times, "Times New Roman", serif;
+  font-family: "Lato", sans-serif;
   font-size: 36px;
   font-weight: 200;
   letter-spacing: -0.02em;
-  color: #839496; }
+  color: #93a1a1; }
 
 ::selection {
   color: white;
@@ -46,7 +46,7 @@ body {
 .reveal h5,
 .reveal h6 {
   margin: 0 0 20px 0;
-  color: #b58900;
+  color: #eee8d5;
   font-family: "League Gothic", Impact, sans-serif;
   line-height: 0.9em;
   letter-spacing: 0.02em;
@@ -54,7 +54,7 @@ body {
   text-shadow: none; }
 
 .reveal h1 {
-  text-shadow: 0 1px 0 #cccccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbbbbb, 0 4px 0 #b9b9b9, 0 5px 0 #aaaaaa, 0 6px 1px rgba(0, 0, 0, 0.1), 0 0 5px rgba(0, 0, 0, 0.1), 0 1px 3px rgba(0, 0, 0, 0.3), 0 3px 5px rgba(0, 0, 0, 0.2), 0 5px 10px rgba(0, 0, 0, 0.25), 0 20px 20px rgba(0, 0, 0, 0.15); }
+  text-shadow: 0px 0px 6px rgba(0, 0, 0, 0.2); }
 
 /*********************************************
  * LINKS
@@ -83,7 +83,7 @@ body {
 .reveal section img {
   margin: 15px 0px;
   background: rgba(255, 255, 255, 0.12);
-  border: 4px solid #839496;
+  border: 4px solid #93a1a1;
   box-shadow: 0 0 10px rgba(0, 0, 0, 0.15);
   -webkit-transition: all 0.2s linear;
   -moz-transition: all 0.2s linear;
diff --git a/css/theme/solarized_light.css b/css/theme/solarized.css
similarity index 83%
rename from css/theme/solarized_light.css
rename to css/theme/solarized.css
index 82df7bb6..a89fd096 100644
--- a/css/theme/solarized_light.css
+++ b/css/theme/solarized.css
@@ -25,7 +25,7 @@ body {
   background-color: #fdf6e3; }
 
 .reveal {
-  font-family: "Lato", Times, "Times New Roman", serif;
+  font-family: "Lato", sans-serif;
   font-size: 36px;
   font-weight: 200;
   letter-spacing: -0.02em;
@@ -46,7 +46,7 @@ body {
 .reveal h5,
 .reveal h6 {
   margin: 0 0 20px 0;
-  color: #859900;
+  color: #586e75;
   font-family: "League Gothic", Impact, sans-serif;
   line-height: 0.9em;
   letter-spacing: 0.02em;
@@ -54,13 +54,13 @@ body {
   text-shadow: none; }
 
 .reveal h1 {
-  text-shadow: 0 1px 0 #cccccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbbbbb, 0 4px 0 #b9b9b9, 0 5px 0 #aaaaaa, 0 6px 1px rgba(0, 0, 0, 0.1), 0 0 5px rgba(0, 0, 0, 0.1), 0 1px 3px rgba(0, 0, 0, 0.3), 0 3px 5px rgba(0, 0, 0, 0.2), 0 5px 10px rgba(0, 0, 0, 0.25), 0 20px 20px rgba(0, 0, 0, 0.15); }
+  text-shadow: 0px 0px 6px rgba(0, 0, 0, 0.2); }
 
 /*********************************************
  * LINKS
  *********************************************/
 .reveal a:not(.image) {
-  color: #b58900;
+  color: #268bd2;
   text-decoration: none;
   -webkit-transition: color 0.15s ease;
   -moz-transition: color 0.15s ease;
@@ -69,13 +69,13 @@ body {
   transition: color 0.15s ease; }
 
 .reveal a:not(.image):hover {
-  color: #ffc81c;
+  color: #78b9e6;
   text-shadow: none;
   border: none; }
 
 .reveal .roll span:after {
   color: #fff;
-  background: #694f00; }
+  background: #1a6091; }
 
 /*********************************************
  * IMAGES
@@ -93,7 +93,7 @@ body {
 
 .reveal a:hover img {
   background: rgba(255, 255, 255, 0.2);
-  border-color: #b58900;
+  border-color: #268bd2;
   box-shadow: 0 0 20px rgba(0, 0, 0, 0.55); }
 
 /*********************************************
@@ -101,31 +101,31 @@ body {
  *********************************************/
 .reveal .controls div.navigate-left,
 .reveal .controls div.navigate-left.enabled {
-  border-right-color: #b58900; }
+  border-right-color: #268bd2; }
 
 .reveal .controls div.navigate-right,
 .reveal .controls div.navigate-right.enabled {
-  border-left-color: #b58900; }
+  border-left-color: #268bd2; }
 
 .reveal .controls div.navigate-up,
 .reveal .controls div.navigate-up.enabled {
-  border-bottom-color: #b58900; }
+  border-bottom-color: #268bd2; }
 
 .reveal .controls div.navigate-down,
 .reveal .controls div.navigate-down.enabled {
-  border-top-color: #b58900; }
+  border-top-color: #268bd2; }
 
 .reveal .controls div.navigate-left.enabled:hover {
-  border-right-color: #ffc81c; }
+  border-right-color: #78b9e6; }
 
 .reveal .controls div.navigate-right.enabled:hover {
-  border-left-color: #ffc81c; }
+  border-left-color: #78b9e6; }
 
 .reveal .controls div.navigate-up.enabled:hover {
-  border-bottom-color: #ffc81c; }
+  border-bottom-color: #78b9e6; }
 
 .reveal .controls div.navigate-down.enabled:hover {
-  border-top-color: #ffc81c; }
+  border-top-color: #78b9e6; }
 
 /*********************************************
  * PROGRESS BAR
@@ -134,7 +134,7 @@ body {
   background: rgba(0, 0, 0, 0.2); }
 
 .reveal .progress span {
-  background: #b58900;
+  background: #268bd2;
   -webkit-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985);
   -moz-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985);
   -ms-transition: width 800ms cubic-bezier(0.26, 0.86, 0.44, 0.985);
diff --git a/css/theme/source/solarized_dark.scss b/css/theme/source/moon.scss
similarity index 76%
rename from css/theme/source/solarized_dark.scss
rename to css/theme/source/moon.scss
index a54854b9..b1209358 100644
--- a/css/theme/source/solarized_dark.scss
+++ b/css/theme/source/moon.scss
@@ -34,17 +34,32 @@ html * {
 	rendering-intent: auto;
 }
 
-@import "solarized_colors.scss";
+// Solarized colors
+$base03:    #002b36;
+$base02:    #073642;
+$base01:    #586e75;
+$base00:    #657b83;
+$base0:     #839496;
+$base1:     #93a1a1;
+$base2:     #eee8d5;
+$base3:     #fdf6e3;
+$yellow:    #b58900;
+$orange:    #cb4b16;
+$red:       #dc322f;
+$magenta:   #d33682;
+$violet:    #6c71c4;
+$blue:      #268bd2;
+$cyan:      #2aa198;
+$green:     #859900;
 
 // Override theme settings (see ../template/settings.scss)
-$mainColor: $base0;
-$headingColor: $yellow;
+$mainColor: $base1;
+$headingColor: $base2;
 $headingTextShadow: none;
 $backgroundColor: $base03;
 $linkColor: $blue;
 $linkColorHover: lighten( $linkColor, 20% );
 $selectionBackgroundColor: $magenta;
-$heading1TextShadow: 0 1px 0 #ccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbb, 0 4px 0 #b9b9b9, 0 5px 0 #aaa, 0 6px 1px rgba(0,0,0,.1), 0 0 5px rgba(0,0,0,.1), 0 1px 3px rgba(0,0,0,.3), 0 3px 5px rgba(0,0,0,.2), 0 5px 10px rgba(0,0,0,.25), 0 20px 20px rgba(0,0,0,.15);
 
 
 
diff --git a/css/theme/source/solarized_light.scss b/css/theme/source/solarized.scss
similarity index 77%
rename from css/theme/source/solarized_light.scss
rename to css/theme/source/solarized.scss
index 18f56124..5e283efe 100644
--- a/css/theme/source/solarized_light.scss
+++ b/css/theme/source/solarized.scss
@@ -35,17 +35,32 @@ html * {
 	rendering-intent: auto;
 }
 
-@import "solarized_colors.scss";
+// Solarized colors
+$base03:    #002b36;
+$base02:    #073642;
+$base01:    #586e75;
+$base00:    #657b83;
+$base0:     #839496;
+$base1:     #93a1a1;
+$base2:     #eee8d5;
+$base3:     #fdf6e3;
+$yellow:    #b58900;
+$orange:    #cb4b16;
+$red:       #dc322f;
+$magenta:   #d33682;
+$violet:    #6c71c4;
+$blue:      #268bd2;
+$cyan:      #2aa198;
+$green:     #859900;
 
 // Override theme settings (see ../template/settings.scss)
 $mainColor: $base00;
-$headingColor: $green;
+$headingColor: $base01;
 $headingTextShadow: none;
 $backgroundColor: $base3;
-$linkColor: $yellow;
+$linkColor: $blue;
 $linkColorHover: lighten( $linkColor, 20% );
 $selectionBackgroundColor: $magenta;
-$heading1TextShadow: 0 1px 0 #ccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbb, 0 4px 0 #b9b9b9, 0 5px 0 #aaa, 0 6px 1px rgba(0,0,0,.1), 0 0 5px rgba(0,0,0,.1), 0 1px 3px rgba(0,0,0,.3), 0 3px 5px rgba(0,0,0,.2), 0 5px 10px rgba(0,0,0,.25), 0 20px 20px rgba(0,0,0,.15);
 
 // Background generator
 // @mixin bodyBackground() {
diff --git a/css/theme/source/solarized_colors.scss b/css/theme/source/solarized_colors.scss
deleted file mode 100644
index 17b490fe..00000000
--- a/css/theme/source/solarized_colors.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-$base03:    #002b36;
-$base02:    #073642;
-$base01:    #586e75;
-$base00:    #657b83;
-$base0:     #839496;
-$base1:     #93a1a1;
-$base2:     #eee8d5;
-$base3:     #fdf6e3;
-$yellow:    #b58900;
-$orange:    #cb4b16;
-$red:       #dc322f;
-$magenta:   #d33682;
-$violet:    #6c71c4;
-$blue:      #268bd2;
-$cyan:      #2aa198;
-$green:     #859900;
-