From 7e449cf2703c8a4ecba1aaa79aee1bac3654c04b Mon Sep 17 00:00:00 2001 From: Jed Northridge Date: Fri, 23 Jan 2015 21:19:14 -0500 Subject: [PATCH 1/5] [3.0] Update reveal.js to 3.0.0+ --- files/reveal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/reveal.js b/files/reveal.js index 6c8becc..9a89e39 160000 --- a/files/reveal.js +++ b/files/reveal.js @@ -1 +1 @@ -Subproject commit 6c8becc51b9cc1ef5078af0a92ea5161244458eb +Subproject commit 9a89e39367dda0d39a618c9672df59b95b7eb3a8 From d782b9fe59eaa1184823153975d2d1c827e8f337 Mon Sep 17 00:00:00 2001 From: Jed Northridge Date: Fri, 23 Jan 2015 21:43:30 -0500 Subject: [PATCH 2/5] [3.0] Change default theme: was 'default', now 'black' --- features/generate-with-ruby.feature | 8 ++++---- lib/reveal-ck/config.rb | 2 +- spec/lib/reveal-ck/config_spec.rb | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/features/generate-with-ruby.feature b/features/generate-with-ruby.feature index f2c5bd8..cc092f7 100644 --- a/features/generate-with-ruby.feature +++ b/features/generate-with-ruby.feature @@ -32,10 +32,10 @@ Feature: Slides with ruby And the file "slides/slides.html" should have html matching the xpath: | //section/p[contains(., "Slides with Ruby")] | the p | And the file "slides/index.html" should have html matching the xpath: - | //section/p[contains(., "Slides with Ruby")] | the p | - | /html/head/title[contains(., "Slides")] | the title | - | //meta[@name="author"][@content=""] | the empty author meta | - | //link[@rel="stylesheet"][@href="css/theme/default.css"] | the theme css | + | //section/p[contains(., "Slides with Ruby")] | the p | + | /html/head/title[contains(., "Slides")] | the title | + | //meta[@name="author"][@content=""] | the empty author meta | + | //link[@rel="stylesheet"][@href="css/theme/black.css"] | the theme css | And the file "slides/index.html" should contain: """ transition: 'default' diff --git a/lib/reveal-ck/config.rb b/lib/reveal-ck/config.rb index f7f5de1..1eaae4d 100644 --- a/lib/reveal-ck/config.rb +++ b/lib/reveal-ck/config.rb @@ -24,7 +24,7 @@ def core_defaults { 'title' => 'Slides', 'author' => '', - 'theme' => 'default', + 'theme' => 'black', 'transition' => 'default', 'data' => { diff --git a/spec/lib/reveal-ck/config_spec.rb b/spec/lib/reveal-ck/config_spec.rb index 3981425..c585335 100644 --- a/spec/lib/reveal-ck/config_spec.rb +++ b/spec/lib/reveal-ck/config_spec.rb @@ -7,8 +7,8 @@ module RevealCK end describe 'core attributes' do - it 'supplies a default theme' do - expect(config.theme).to eq 'default' + it 'supplies a default theme (black)' do + expect(config.theme).to eq 'black' end it 'supplies an #theme, and #theme=' do From 9b31fa412c7a16c782038ed5588ec39233dd2653 Mon Sep 17 00:00:00 2001 From: Jed Northridge Date: Fri, 23 Jan 2015 21:45:57 -0500 Subject: [PATCH 3/5] [3.0] Update index.html templates to match latest --- files/reveal-ck/templates/index.html/head.html.erb | 12 ++++++++---- files/reveal-ck/templates/index.html/script.js.erb | 7 ++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/files/reveal-ck/templates/index.html/head.html.erb b/files/reveal-ck/templates/index.html/head.html.erb index cb0b887..225089e 100644 --- a/files/reveal-ck/templates/index.html/head.html.erb +++ b/files/reveal-ck/templates/index.html/head.html.erb @@ -8,12 +8,12 @@ - + - + @@ -22,9 +22,13 @@ <% end %> - +