From b09923551a0ba95fac3631f992793e44d71f474f Mon Sep 17 00:00:00 2001
From: Hakim El Hattab <hakim.elhattab@gmail.com>
Date: Wed, 5 Nov 2014 11:52:32 +0100
Subject: [PATCH] theme updates, normalized spacing between block-level
 elements

---
 css/theme/beige.css              | 6 +++---
 css/theme/black.css              | 6 +++---
 css/theme/blood.css              | 6 +++---
 css/theme/default.css            | 6 +++---
 css/theme/moon.css               | 6 +++---
 css/theme/night.css              | 6 +++---
 css/theme/serif.css              | 6 +++---
 css/theme/simple.css             | 6 +++---
 css/theme/sky.css                | 6 +++---
 css/theme/solarized.css          | 6 +++---
 css/theme/template/settings.scss | 5 ++++-
 css/theme/template/theme.scss    | 6 +++---
 index.html                       | 4 +---
 13 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/css/theme/beige.css b/css/theme/beige.css
index 83263fbd..1a57b33c 100644
--- a/css/theme/beige.css
+++ b/css/theme/beige.css
@@ -71,7 +71,7 @@ body {
  * OTHER
  *********************************************/
 .reveal p {
-  margin-bottom: 10px;
+  margin: 20px 0;
   line-height: 1.3; }
 
 /* Ensure certain elements are never larger than the slide itself */
@@ -119,7 +119,7 @@ body {
   display: block;
   position: relative;
   width: 70%;
-  margin: 5px auto;
+  margin: 20px auto;
   padding: 5px;
   font-style: italic;
   background: rgba(255, 255, 255, 0.05);
@@ -135,7 +135,7 @@ body {
   display: block;
   position: relative;
   width: 90%;
-  margin: 15px auto;
+  margin: 20px auto;
   text-align: left;
   font-size: 0.55em;
   font-family: monospace;
diff --git a/css/theme/black.css b/css/theme/black.css
index a790d861..6c16a37a 100644
--- a/css/theme/black.css
+++ b/css/theme/black.css
@@ -59,7 +59,7 @@ body {
  * OTHER
  *********************************************/
 .reveal p {
-  margin-bottom: 10px;
+  margin: 20px 0;
   line-height: 1.3; }
 
 /* Ensure certain elements are never larger than the slide itself */
@@ -107,7 +107,7 @@ body {
   display: block;
   position: relative;
   width: 70%;
-  margin: 5px auto;
+  margin: 20px auto;
   padding: 5px;
   font-style: italic;
   background: rgba(255, 255, 255, 0.05);
@@ -123,7 +123,7 @@ body {
   display: block;
   position: relative;
   width: 90%;
-  margin: 15px auto;
+  margin: 20px auto;
   text-align: left;
   font-size: 0.55em;
   font-family: monospace;
diff --git a/css/theme/blood.css b/css/theme/blood.css
index d73dc2f6..b2c6941d 100644
--- a/css/theme/blood.css
+++ b/css/theme/blood.css
@@ -70,7 +70,7 @@ body {
  * OTHER
  *********************************************/
 .reveal p {
-  margin-bottom: 10px;
+  margin: 20px 0;
   line-height: 1.3; }
 
 /* Ensure certain elements are never larger than the slide itself */
@@ -118,7 +118,7 @@ body {
   display: block;
   position: relative;
   width: 70%;
-  margin: 5px auto;
+  margin: 20px auto;
   padding: 5px;
   font-style: italic;
   background: rgba(255, 255, 255, 0.05);
@@ -134,7 +134,7 @@ body {
   display: block;
   position: relative;
   width: 90%;
-  margin: 15px auto;
+  margin: 20px auto;
   text-align: left;
   font-size: 0.55em;
   font-family: monospace;
diff --git a/css/theme/default.css b/css/theme/default.css
index 8e064bf3..c3e5edf1 100644
--- a/css/theme/default.css
+++ b/css/theme/default.css
@@ -71,7 +71,7 @@ body {
  * OTHER
  *********************************************/
 .reveal p {
-  margin-bottom: 10px;
+  margin: 20px 0;
   line-height: 1.3; }
 
 /* Ensure certain elements are never larger than the slide itself */
@@ -119,7 +119,7 @@ body {
   display: block;
   position: relative;
   width: 70%;
-  margin: 5px auto;
+  margin: 20px auto;
   padding: 5px;
   font-style: italic;
   background: rgba(255, 255, 255, 0.05);
@@ -135,7 +135,7 @@ body {
   display: block;
   position: relative;
   width: 90%;
-  margin: 15px auto;
+  margin: 20px auto;
   text-align: left;
   font-size: 0.55em;
   font-family: monospace;
diff --git a/css/theme/moon.css b/css/theme/moon.css
index d90616a5..4a83bdec 100644
--- a/css/theme/moon.css
+++ b/css/theme/moon.css
@@ -71,7 +71,7 @@ body {
  * OTHER
  *********************************************/
 .reveal p {
-  margin-bottom: 10px;
+  margin: 20px 0;
   line-height: 1.3; }
 
 /* Ensure certain elements are never larger than the slide itself */
@@ -119,7 +119,7 @@ body {
   display: block;
   position: relative;
   width: 70%;
-  margin: 5px auto;
+  margin: 20px auto;
   padding: 5px;
   font-style: italic;
   background: rgba(255, 255, 255, 0.05);
@@ -135,7 +135,7 @@ body {
   display: block;
   position: relative;
   width: 90%;
-  margin: 15px auto;
+  margin: 20px auto;
   text-align: left;
   font-size: 0.55em;
   font-family: monospace;
diff --git a/css/theme/night.css b/css/theme/night.css
index 69dd2242..f0f3623b 100644
--- a/css/theme/night.css
+++ b/css/theme/night.css
@@ -59,7 +59,7 @@ body {
  * OTHER
  *********************************************/
 .reveal p {
-  margin-bottom: 10px;
+  margin: 20px 0;
   line-height: 1.3; }
 
 /* Ensure certain elements are never larger than the slide itself */
@@ -107,7 +107,7 @@ body {
   display: block;
   position: relative;
   width: 70%;
-  margin: 5px auto;
+  margin: 20px auto;
   padding: 5px;
   font-style: italic;
   background: rgba(255, 255, 255, 0.05);
@@ -123,7 +123,7 @@ body {
   display: block;
   position: relative;
   width: 90%;
-  margin: 15px auto;
+  margin: 20px auto;
   text-align: left;
   font-size: 0.55em;
   font-family: monospace;
diff --git a/css/theme/serif.css b/css/theme/serif.css
index 28171ad0..c265dc3c 100644
--- a/css/theme/serif.css
+++ b/css/theme/serif.css
@@ -61,7 +61,7 @@ body {
  * OTHER
  *********************************************/
 .reveal p {
-  margin-bottom: 10px;
+  margin: 20px 0;
   line-height: 1.3; }
 
 /* Ensure certain elements are never larger than the slide itself */
@@ -109,7 +109,7 @@ body {
   display: block;
   position: relative;
   width: 70%;
-  margin: 5px auto;
+  margin: 20px auto;
   padding: 5px;
   font-style: italic;
   background: rgba(255, 255, 255, 0.05);
@@ -125,7 +125,7 @@ body {
   display: block;
   position: relative;
   width: 90%;
-  margin: 15px auto;
+  margin: 20px auto;
   text-align: left;
   font-size: 0.55em;
   font-family: monospace;
diff --git a/css/theme/simple.css b/css/theme/simple.css
index 6d65454d..58bc3ec7 100644
--- a/css/theme/simple.css
+++ b/css/theme/simple.css
@@ -61,7 +61,7 @@ body {
  * OTHER
  *********************************************/
 .reveal p {
-  margin-bottom: 10px;
+  margin: 20px 0;
   line-height: 1.3; }
 
 /* Ensure certain elements are never larger than the slide itself */
@@ -109,7 +109,7 @@ body {
   display: block;
   position: relative;
   width: 70%;
-  margin: 5px auto;
+  margin: 20px auto;
   padding: 5px;
   font-style: italic;
   background: rgba(255, 255, 255, 0.05);
@@ -125,7 +125,7 @@ body {
   display: block;
   position: relative;
   width: 90%;
-  margin: 15px auto;
+  margin: 20px auto;
   text-align: left;
   font-size: 0.55em;
   font-family: monospace;
diff --git a/css/theme/sky.css b/css/theme/sky.css
index 36d0b025..7f3e6897 100644
--- a/css/theme/sky.css
+++ b/css/theme/sky.css
@@ -68,7 +68,7 @@ body {
  * OTHER
  *********************************************/
 .reveal p {
-  margin-bottom: 10px;
+  margin: 20px 0;
   line-height: 1.3; }
 
 /* Ensure certain elements are never larger than the slide itself */
@@ -116,7 +116,7 @@ body {
   display: block;
   position: relative;
   width: 70%;
-  margin: 5px auto;
+  margin: 20px auto;
   padding: 5px;
   font-style: italic;
   background: rgba(255, 255, 255, 0.05);
@@ -132,7 +132,7 @@ body {
   display: block;
   position: relative;
   width: 90%;
-  margin: 15px auto;
+  margin: 20px auto;
   text-align: left;
   font-size: 0.55em;
   font-family: monospace;
diff --git a/css/theme/solarized.css b/css/theme/solarized.css
index dd4ec2b3..5eb2a9d1 100644
--- a/css/theme/solarized.css
+++ b/css/theme/solarized.css
@@ -71,7 +71,7 @@ body {
  * OTHER
  *********************************************/
 .reveal p {
-  margin-bottom: 10px;
+  margin: 20px 0;
   line-height: 1.3; }
 
 /* Ensure certain elements are never larger than the slide itself */
@@ -119,7 +119,7 @@ body {
   display: block;
   position: relative;
   width: 70%;
-  margin: 5px auto;
+  margin: 20px auto;
   padding: 5px;
   font-style: italic;
   background: rgba(255, 255, 255, 0.05);
@@ -135,7 +135,7 @@ body {
   display: block;
   position: relative;
   width: 90%;
-  margin: 15px auto;
+  margin: 20px auto;
   text-align: left;
   font-size: 0.55em;
   font-family: monospace;
diff --git a/css/theme/template/settings.scss b/css/theme/template/settings.scss
index 88f7d758..7e484f8b 100644
--- a/css/theme/template/settings.scss
+++ b/css/theme/template/settings.scss
@@ -9,8 +9,11 @@ $mainFont: 'Lato', sans-serif;
 $mainFontSize: 36px;
 $mainColor: #eee;
 
+// Vertical spacing between blocks of text
+$blockMargin: 20px;
+
 // Headings
-$headingMargin: 0 0 20px 0;
+$headingMargin: 0 0 $blockMargin 0;
 $headingFont: 'League Gothic', Impact, sans-serif;
 $headingColor: #eee;
 $headingLineHeight: 1.2;
diff --git a/css/theme/template/theme.scss b/css/theme/template/theme.scss
index f2a542e9..da907f58 100644
--- a/css/theme/template/theme.scss
+++ b/css/theme/template/theme.scss
@@ -66,7 +66,7 @@ body {
  *********************************************/
 
 .reveal p {
-	margin-bottom: 10px;
+	margin: $blockMargin 0;
 	line-height: 1.3;
 }
 
@@ -136,7 +136,7 @@ body {
 	display: block;
 	position: relative;
 	width: 70%;
-	margin: 5px auto;
+	margin: $blockMargin auto;
 	padding: 5px;
 
 	font-style: italic;
@@ -156,7 +156,7 @@ body {
 	display: block;
 	position: relative;
 	width: 90%;
-	margin: 15px auto;
+	margin: $blockMargin auto;
 
 	text-align: left;
 	font-size: 0.55em;
diff --git a/index.html b/index.html
index 5c34e392..b5be94b8 100644
--- a/index.html
+++ b/index.html
@@ -42,7 +42,7 @@
 			<div class="slides">
 				<section>
 					<h1>Reveal.js</h1>
-					<h3>HTML Presentations Made Easy</h3>
+					<h3>The HTML Presentation Framwork</h3>
 					<p>
 						<small>Created by <a href="http://hakim.se">Hakim El Hattab</a> / <a href="http://twitter.com/hakimel">@hakimel</a></small>
 					</p>
@@ -326,8 +326,6 @@ function linkify( selector ) {
 						<p class="fragment roll-in">roll-in</p>
 						<p class="fragment fade-out">fade-out</p>
 						<p class="fragment highlight-red">highlight-red</p>
-						<p class="fragment highlight-green">highlight-green</p>
-						<p class="fragment highlight-blue">highlight-blue</p>
 						<p class="fragment current-visible">current-visible</p>
 						<p class="fragment highlight-current-blue">highlight-current-blue</p>
 					</section>