all themes now have contrasting text colors based on slide bg

11 files changed, 46 insertions, 16 deletions

diff --git a/css/theme/source/beige.scss b/css/theme/source/beige.scss
index acdd37d..d82c510 100644
--- a/css/theme/source/beige.scss
+++ b/css/theme/source/beige.scss
@@ -32,6 +32,8 @@ $heading1TextShadow: 0 1px 0 #ccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbb, 0 4px 0 #b9b9b
 	@include radial-gradient( rgba(247,242,211,1), rgba(255,255,255,1) );
 }
 
+// Change text colors against dark slide backgrounds
+@include dark-bg-text-color(#fff);
 
 
 // Theme template ------------------------------
diff --git a/css/theme/source/black.scss b/css/theme/source/black.scss
index 45d2678..ba72335 100644
--- a/css/theme/source/black.scss
+++ b/css/theme/source/black.scss
@@ -37,11 +37,8 @@ $heading2Size: 1.6em;
 $heading3Size: 1.3em;
 $heading4Size: 1.0em;
 
-section.has-light-background {
-	&, h1, h2, h3, h4, h5, h6 {
-		color: #222;
-	}
-}
+// Change text colors against light slide backgrounds
+@include light-bg-text-color(#222);
 
 
 // Theme template ------------------------------
diff --git a/css/theme/source/blood.scss b/css/theme/source/blood.scss
index 4533fc0..b5a8679 100644
--- a/css/theme/source/blood.scss
+++ b/css/theme/source/blood.scss
@@ -46,6 +46,9 @@ $linkColorHover: lighten( $linkColor, 20% );
 $selectionBackgroundColor: $blood;
 $selectionColor: #fff;
 
+// Change text colors against dark slide backgrounds
+@include light-bg-text-color(#222);
+
 
 // Theme template ------------------------------
 @import "../template/theme";
@@ -58,6 +61,12 @@ $selectionColor: #fff;
     text-shadow: 1px 1px $coal;
 }
 
+section.has-light-background {
+	p, h1, h2, h3, h4 {
+		text-shadow: none;
+	}
+}
+
 .reveal h1,
 .reveal h2,
 .reveal h3,
diff --git a/css/theme/source/league.scss b/css/theme/source/league.scss
index 95bacd4..6b9697e 100644
--- a/css/theme/source/league.scss
+++ b/css/theme/source/league.scss
@@ -27,6 +27,8 @@ $heading1TextShadow: 0 1px 0 #ccc, 0 2px 0 #c9c9c9, 0 3px 0 #bbb, 0 4px 0 #b9b9b
 	@include radial-gradient( rgba(28,30,32,1), rgba(85,90,95,1) );
 }
 
+// Change text colors against light slide backgrounds
+@include light-bg-text-color(#222);
 
 
 // Theme template ------------------------------
diff --git a/css/theme/source/moon.scss b/css/theme/source/moon.scss
index db1897c..b398f4f 100644
--- a/css/theme/source/moon.scss
+++ b/css/theme/source/moon.scss
@@ -50,7 +50,8 @@ $linkColor: $blue;
 $linkColorHover: lighten( $linkColor, 20% );
 $selectionBackgroundColor: $magenta;
 
-
+// Change text colors against light slide backgrounds
+@include light-bg-text-color(#222);
 
 // Theme template ------------------------------
 @import "../template/theme";
diff --git a/css/theme/source/night.scss b/css/theme/source/night.scss
index d49a282..98a2062 100644
--- a/css/theme/source/night.scss
+++ b/css/theme/source/night.scss
@@ -28,6 +28,9 @@ $headingLetterSpacing: -0.03em;
 $headingTextTransform: none;
 $selectionBackgroundColor: #e7ad52;
 
+// Change text colors against light slide backgrounds
+@include light-bg-text-color(#222);
+
 
 // Theme template ------------------------------
 @import "../template/theme";
diff --git a/css/theme/source/serif.scss b/css/theme/source/serif.scss
index ec3fcb3..1c8d778 100644
--- a/css/theme/source/serif.scss
+++ b/css/theme/source/serif.scss
@@ -29,6 +29,9 @@ $selectionBackgroundColor: #26351C;
   line-height: 1.3em;
 }
 
+// Change text colors against dark slide backgrounds
+@include dark-bg-text-color(#fff);
+
 
 // Theme template ------------------------------
 @import "../template/theme";
diff --git a/css/theme/source/simple.scss b/css/theme/source/simple.scss
index 394c9cd..faf245f 100644
--- a/css/theme/source/simple.scss
+++ b/css/theme/source/simple.scss
@@ -31,11 +31,8 @@ $linkColor: #00008B;
 $linkColorHover: lighten( $linkColor, 20% );
 $selectionBackgroundColor: rgba(0, 0, 0, 0.99);
 
-section.has-dark-background {
-	&, h1, h2, h3, h4, h5, h6 {
-		color: #fff;
-	}
-}
+// Change text colors against dark slide backgrounds
+@include dark-bg-text-color(#fff);
 
 
 // Theme template ------------------------------
diff --git a/css/theme/source/sky.scss b/css/theme/source/sky.scss
index 3fee67c..c83b9c0 100644
--- a/css/theme/source/sky.scss
+++ b/css/theme/source/sky.scss
@@ -39,6 +39,9 @@ $selectionBackgroundColor: #134674;
 	@include radial-gradient( #add9e4, #f7fbfc );
 }
 
+// Change text colors against dark slide backgrounds
+@include dark-bg-text-color(#fff);
+
 
 
 // Theme template ------------------------------
diff --git a/css/theme/source/white.scss b/css/theme/source/white.scss
index 7b817fe..20e8f7e 100644
--- a/css/theme/source/white.scss
+++ b/css/theme/source/white.scss
@@ -37,11 +37,8 @@ $heading2Size: 1.6em;
 $heading3Size: 1.3em;
 $heading4Size: 1.0em;
 
-section.has-dark-background {
-	&, h1, h2, h3, h4, h5, h6 {
-		color: #fff;
-	}
-}
+// Change text colors against dark slide backgrounds
+@include dark-bg-text-color(#fff);
 
 
 // Theme template ------------------------------
diff --git a/css/theme/template/mixins.scss b/css/theme/template/mixins.scss
index e0c5606..17a3db5 100644
--- a/css/theme/template/mixins.scss
+++ b/css/theme/template/mixins.scss
@@ -26,4 +26,20 @@
 	background: -o-radial-gradient( center, $type cover,  $inner 0%, $outer 100% );
 	background: -ms-radial-gradient( center, $type cover,  $inner 0%, $outer 100% );
 	background: radial-gradient( center, $type cover,  $inner 0%, $outer 100% );
+}
+
+@mixin light-bg-text-color( $color ) {
+	section.has-light-background {
+		&, h1, h2, h3, h4, h5, h6 {
+			color: $color;
+		}
+	}
+}
+
+@mixin dark-bg-text-color( $color ) {
+	section.has-dark-background {
+		&, h1, h2, h3, h4, h5, h6 {
+			color: $color;
+		}
+	}
 }
\ No newline at end of file