From 2990909cc4060382cccadaf8ed75b4e64faa7567 Mon Sep 17 00:00:00 2001 From: Owen Versteeg Date: Mon, 10 Jun 2013 20:32:34 -0300 Subject: [PATCH 1/6] update serif (change controls, fix links, change url) The Serif theme was a little flaky previously --- css/theme/serif.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/css/theme/serif.css b/css/theme/serif.css index 37833f6..aee7a8c 100644 --- a/css/theme/serif.css +++ b/css/theme/serif.css @@ -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. - * 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. + * This theme is Copyright (C) 2012-2013 Owen Versteeg, http://owenversteeg.com - it is MIT licensed. */ /********************************************* * GLOBAL STYLES @@ -48,6 +47,7 @@ body { * LINKS *********************************************/ .reveal a:not(.image) { + line-height: 1.3em; color: #51483d; text-decoration: none; -webkit-transition: color .15s ease; @@ -87,6 +87,9 @@ body { /********************************************* * NAVIGATION CONTROLS *********************************************/ +.reveal .controls div { + opacity: 0.15; } + .reveal .controls div.navigate-left, .reveal .controls div.navigate-left.enabled { border-right-color: #51483d; } From 6acfcad2f4f8bf49ee7fcdb5b5cd7c16991b8924 Mon Sep 17 00:00:00 2001 From: Owen Versteeg Date: Mon, 10 Jun 2013 20:47:12 -0300 Subject: [PATCH 2/6] correct links in sky theme They looked a little wonky if you used a G or a Y. --- css/theme/sky.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/theme/sky.css b/css/theme/sky.css index 79eaf7f..c6c01ad 100644 --- a/css/theme/sky.css +++ b/css/theme/sky.css @@ -54,6 +54,7 @@ body { * LINKS *********************************************/ .reveal a:not(.image) { + line-height: 1.3em; color: #3b759e; text-decoration: none; -webkit-transition: color .15s ease; From c5408f37da9e12154eb8ffa49a998126059aff39 Mon Sep 17 00:00:00 2001 From: Owen Versteeg Date: Thu, 13 Jun 2013 19:42:19 -0400 Subject: [PATCH 3/6] Fix links so they aren't cut off (in SCSS) --- css/theme/source/sky.scss | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/css/theme/source/sky.scss b/css/theme/source/sky.scss index f3d7570..72a3a90 100644 --- a/css/theme/source/sky.scss +++ b/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"; -// --------------------------------------------- \ No newline at end of file +// --------------------------------------------- From cc133679be3e2902dccaf66e87922967996d1f57 Mon Sep 17 00:00:00 2001 From: Owen Versteeg Date: Thu, 13 Jun 2013 20:48:20 -0300 Subject: [PATCH 4/6] Fix links so they aren't cut off (in SCSS) --- css/theme/source/serif.scss | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/css/theme/source/serif.scss b/css/theme/source/serif.scss index 06eaca8..404b8bf 100644 --- a/css/theme/source/serif.scss +++ b/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. - * 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. + * This theme is Copyright (C) 2012-2013 Owen Versteeg, http://owenversteeg.com - it is MIT licensed. */ @@ -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"; -// --------------------------------------------- \ No newline at end of file +// --------------------------------------------- From a9dce74e24d0cc3e5af69f5a0ff5ce4c90b1dcb6 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Thu, 13 Jun 2013 21:31:48 -0400 Subject: [PATCH 5/6] recompile themes #488 --- css/theme/serif.css | 7 +++---- css/theme/sky.css | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/css/theme/serif.css b/css/theme/serif.css index aee7a8c..734de56 100644 --- a/css/theme/serif.css +++ b/css/theme/serif.css @@ -4,6 +4,9 @@ * * This theme is Copyright (C) 2012-2013 Owen Versteeg, http://owenversteeg.com - it is MIT licensed. */ +.reveal a:not(.image) { + line-height: 1.3em; } + /********************************************* * GLOBAL STYLES *********************************************/ @@ -47,7 +50,6 @@ body { * LINKS *********************************************/ .reveal a:not(.image) { - line-height: 1.3em; color: #51483d; text-decoration: none; -webkit-transition: color .15s ease; @@ -87,9 +89,6 @@ body { /********************************************* * NAVIGATION CONTROLS *********************************************/ -.reveal .controls div { - opacity: 0.15; } - .reveal .controls div.navigate-left, .reveal .controls div.navigate-left.enabled { border-right-color: #51483d; } diff --git a/css/theme/sky.css b/css/theme/sky.css index c6c01ad..35d048e 100644 --- a/css/theme/sky.css +++ b/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 *********************************************/ @@ -54,7 +57,6 @@ body { * LINKS *********************************************/ .reveal a:not(.image) { - line-height: 1.3em; color: #3b759e; text-decoration: none; -webkit-transition: color .15s ease; From 516b1fc794513e691987372a25ac61bb79d13439 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Sun, 16 Jun 2013 19:29:07 -0400 Subject: [PATCH 6/6] readme typo (closes #495) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 43f7e50..3264236 100644 --- a/README.md +++ b/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```