Merge remote-tracking branch 'upstream/master'

README.md

@@ -465,7 +465,7 @@ Served from a static file server accessible (preferably) only to the presenter.
 1. ```npm install node-static```
 2. ```static```
 
-If you want to use the speaker notes plugin with you master presentation then make sure you have the speaker notes plugin configured correctly along with the configuration shown below, then execute ```node plugin/notes-server``` in the directory of your master presentation. The configuration below will cause it to connect to the socket.io server as a master, as well as launch your speaker-notes/static-file server.
+If you want to use the speaker notes plugin with your master presentation then make sure you have the speaker notes plugin configured correctly along with the configuration shown below, then execute ```node plugin/notes-server``` in the directory of your master presentation. The configuration below will cause it to connect to the socket.io server as a master, as well as launch your speaker-notes/static-file server.
 
 You can then access your master presentation at ```http://localhost:1947```
 

css/theme/serif.css

@@ -1,10 +1,12 @@
 /**
  * A simple theme for reveal.js presentations, similar
- * to the default theme. The accent color is darkblue.
+ * to the default theme. The accent color is brown.
  *
- * This theme is Copyright (C) 2012 Owen Versteeg, https://github.com/StereotypicalApps. It is MIT licensed.
+ * This theme is Copyright (C) 2012-2013 Owen Versteeg, http://owenversteeg.com - it is MIT licensed.
- * reveal.js is Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se; so is the theme - beige.css - that this is based off of.
  */
+.reveal a:not(.image) {
+  line-height: 1.3em; }
+
 /*********************************************
  * GLOBAL STYLES
  *********************************************/

css/theme/sky.css

@@ -5,6 +5,9 @@
  *
  * Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se
  */
+.reveal a:not(.image) {
+  line-height: 1.3em; }
+
 /*********************************************
  * GLOBAL STYLES
  *********************************************/

css/theme/source/serif.scss

@@ -1,9 +1,8 @@
 /**
  * A simple theme for reveal.js presentations, similar
- * to the default theme. The accent color is darkblue.
+ * to the default theme. The accent color is brown.
  *
- * This theme is Copyright (C) 2012 Owen Versteeg, https://github.com/StereotypicalApps. It is MIT licensed.
+ * This theme is Copyright (C) 2012-2013 Owen Versteeg, http://owenversteeg.com - it is MIT licensed.
- * reveal.js is Copyright (C) 2011-2012 Hakim El Hattab, http://hakim.se; so is the theme - beige.css - that this is based off of.
  */
 
 
@@ -26,8 +25,11 @@ $linkColor: #51483D;
 $linkColorHover: lighten( $linkColor, 20% );
 $selectionBackgroundColor: #26351C;
 
+.reveal a:not(.image) {
+  line-height: 1.3em;
+}
 
 
 // Theme template ------------------------------
 @import "../template/theme";
-// ---------------------------------------------
+// ---------------------------------------------

css/theme/source/sky.scss

@@ -29,6 +29,11 @@ $linkColor: #3b759e;
 $linkColorHover: lighten( $linkColor, 20% );
 $selectionBackgroundColor: #134674;
 
+// Fix links so they are not cut off
+.reveal a:not(.image) {
+	line-height: 1.3em;
+}
+
 // Background generator
 @mixin bodyBackground() {
 	@include radial-gradient( #add9e4, #f7fbfc );
@@ -38,4 +43,4 @@ $selectionBackgroundColor: #134674;
 
 // Theme template ------------------------------
 @import "../template/theme";
-// ---------------------------------------------
+// ---------------------------------------------