v3.0.0. See CHANGELOG.md for details.

Merge branch '3.0' * 3.0: [3.0] Slight tweak to docs [3.0] CHANGELOG, Version, and Gemspec Date [3.0] Update index.html templates to match latest [3.0] Change default theme: was 'default', now 'black' [3.0] Update reveal.js to 3.0.0+
jedcn · Jan 24, 2015 · 0117a90 · 0117a90
2 parents f53c4ea + 8b430b1
commit 0117a90
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+### 3.0.0 / 2015-01-23
+
+[full changelog](https://github.com/jedcn/reveal-ck/compare/v0.6.2...v3.0.0)
+
+This release makes it so that the presentations generated by reveal-ck
+match up with the 3.0.0 release of reveal.js. For example-- the new
+default theme is "black," and the "white" theme is now available.
+
+See https://github.com/hakimel/reveal.js/releases/tag/3.0.0 for
+details. It's so cool.
+
 ### 0.6.2 / 2015-01-19
 
 [full changelog](https://github.com/jedcn/reveal-ck/compare/v0.6.1...v0.6.2)

diff --git a/README.md b/README.md
@@ -4,6 +4,15 @@
 
 reveal-ck helps you author [reveal.js][reveal.js] presentations.
 
+You can create slides in numerous languages, but the most popular is
+Markdown. And not just any markdown-- it's markdown like you write on
+https://github.com, so it supports:
+
+* emoji (:money_with_wings:)
+* automatic links (https://github.com)
+* @mentions (@jedcn)
+* GFM tables
+
 ## How do I get started?
 
 * Install [the reveal-ck gem][reveal-ck-gem]
@@ -50,6 +59,8 @@ a fan of Markdown you can also use
 ## See also:
 http://jedcn.github.io/reveal-ck/
 ---
+## Might be helpful:
+https://relishapp.com/jedcn/reveal-ck/
 ## Questions? Problems?
 Let me know, @jedcn
 ---

diff --git 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/files/reveal-ck/templates/index.html/head.html.erb b/files/reveal-ck/templates/index.html/head.html.erb
@@ -8,12 +8,12 @@
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 
-<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui">
 
 <link rel="stylesheet" href="css/reveal.css">
 <link rel="stylesheet" href="css/theme/<%= config.theme %>.css" id="theme">
 
-<!-- For syntax highlighting -->
+<!-- Code syntax highlighting -->
 <link rel="stylesheet" href="lib/css/zenburn.css">
 
 <link rel="stylesheet" href="css/reveal-ck.css">
@@ -22,9 +22,13 @@
 <link rel="stylesheet" href="<%= file %>">
 <% end %>
 
-<!-- If the query includes 'print-pdf', use the PDF print sheet -->
+<!-- Printing and PDF exports -->
 <script>
-  document.write( '<link rel="stylesheet" href="css/print/' + ( window.location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' );
+  var link = document.createElement( 'link' );
+  link.rel = 'stylesheet';
+  link.type = 'text/css';
+  link.href = window.location.search.match( /print-pdf/gi ) ? 'css/print/pdf.css' : 'css/print/paper.css';
+  document.getElementsByTagName( 'head' )[0].appendChild( link );
 </script>
 
 <!--[if lt IE 9]>

diff --git a/files/reveal-ck/templates/index.html/script.js.erb b/files/reveal-ck/templates/index.html/script.js.erb
@@ -6,13 +6,14 @@
   }
   var baseOptions = {
     transition: '<%= config.transition %>',
+
     dependencies: [
       { src: 'lib/js/classList.js', condition: function() { return !document.body.classList; } },
       { src: 'plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
       { src: 'plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
-      { src: 'plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
-      { src: 'plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
-      { src: 'plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }
+      { src: 'plugin/highlight/highlight.js', async: true, condition: function() { return !!document.querySelector( 'pre code' ); }, callback: function() { hljs.initHighlightingOnLoad(); } },
+      { src: 'plugin/zoom-js/zoom.js', async: true },
+      { src: 'plugin/notes/notes.js', async: true }
     ]
   };
   var configOptions = <%= config.revealjs_config.to_json %>

diff --git a/files/reveal.js b/files/reveal.js
diff --git 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/lib/reveal-ck/version.rb b/lib/reveal-ck/version.rb
@@ -1,4 +1,4 @@
 # RevealCK::VERSION is the current version of reveal-ck
 module RevealCK
-  VERSION = '0.6.2'
+  VERSION = '3.0.0'
 end
diff --git a/reveal-ck.gemspec b/reveal-ck.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.version     = RevealCK::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Jed Northridge']
-  s.email       = ['northridge@gmail.com']
+  s.email       = ['reveal-ck@jedcn.com']
   s.homepage    = 'https://github.com/jedcn/reveal-ck'
   s.description = 'A reveal.js construction kit'
   s.summary     = 'A toolkit that takes a minimal description of slides and builds a reveal.js presentation'

diff --git 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