Commit 20d858de authored by Hakim El Hattab's avatar Hakim El Hattab
Browse files

Merge pull request #1093 from hakimel/dev

3.0.0
parents 57977e29 3a8fc9b2
...@@ -3,4 +3,6 @@ ...@@ -3,4 +3,6 @@
log/*.log log/*.log
tmp/** tmp/**
node_modules/ node_modules/
.sass-cache .sass-cache
\ No newline at end of file css/reveal.min.css
js/reveal.min.js
...@@ -4,7 +4,7 @@ Please keep the [issue tracker](http://github.com/hakimel/reveal.js/issues) limi ...@@ -4,7 +4,7 @@ Please keep the [issue tracker](http://github.com/hakimel/reveal.js/issues) limi
### Personal Support ### Personal Support
If you have personal support or setup questions the best place to ask those are [StackOverflow](http://stackoverflow.com/questions/tagged/reveal.js). If you have personal support or setup questions the best place to ask those are [StackOverflow](http://stackoverflow.com/questions/tagged/reveal.js).
### Bug Reports ### Bug Reports
...@@ -17,4 +17,3 @@ When reporting a bug make sure to include information about which browser and op ...@@ -17,4 +17,3 @@ When reporting a bug make sure to include information about which browser and op
- Single-quoted strings - Single-quoted strings
- Should be made towards the **dev branch** - Should be made towards the **dev branch**
- Should be submitted from a feature/topic branch (not your master) - Should be submitted from a feature/topic branch (not your master)
- Should not include the minified **reveal.min.js** or **reveal.min.css** files
...@@ -11,7 +11,7 @@ module.exports = function(grunt) { ...@@ -11,7 +11,7 @@ module.exports = function(grunt) {
' * http://lab.hakim.se/reveal-js\n' + ' * http://lab.hakim.se/reveal-js\n' +
' * MIT licensed\n' + ' * MIT licensed\n' +
' *\n' + ' *\n' +
' * Copyright (C) 2014 Hakim El Hattab, http://hakim.se\n' + ' * Copyright (C) 2015 Hakim El Hattab, http://hakim.se\n' +
' */' ' */'
}, },
...@@ -29,18 +29,17 @@ module.exports = function(grunt) { ...@@ -29,18 +29,17 @@ module.exports = function(grunt) {
} }
}, },
cssmin: { sass: {
compress: { core: {
files: { files: {
'css/reveal.min.css': [ 'css/reveal.css' ] 'css/reveal.css': 'css/reveal.scss',
} }
} },
}, themes: {
sass: {
main: {
files: { files: {
'css/theme/default.css': 'css/theme/source/default.scss', 'css/theme/black.css': 'css/theme/source/black.scss',
'css/theme/white.css': 'css/theme/source/white.scss',
'css/theme/league.css': 'css/theme/source/league.scss',
'css/theme/beige.css': 'css/theme/source/beige.scss', 'css/theme/beige.css': 'css/theme/source/beige.scss',
'css/theme/night.css': 'css/theme/source/night.scss', 'css/theme/night.css': 'css/theme/source/night.scss',
'css/theme/serif.css': 'css/theme/source/serif.scss', 'css/theme/serif.css': 'css/theme/source/serif.scss',
...@@ -53,6 +52,20 @@ module.exports = function(grunt) { ...@@ -53,6 +52,20 @@ module.exports = function(grunt) {
} }
}, },
autoprefixer: {
dist: {
src: 'css/reveal.css'
}
},
cssmin: {
compress: {
files: {
'css/reveal.min.css': [ 'css/reveal.css' ]
}
}
},
jshint: { jshint: {
options: { options: {
curly: false, curly: false,
...@@ -70,7 +83,9 @@ module.exports = function(grunt) { ...@@ -70,7 +83,9 @@ module.exports = function(grunt) {
head: false, head: false,
module: false, module: false,
console: false, console: false,
unescape: false unescape: false,
define: false,
exports: false
} }
}, },
files: [ 'Gruntfile.js', 'js/reveal.js' ] files: [ 'Gruntfile.js', 'js/reveal.js' ]
...@@ -80,7 +95,9 @@ module.exports = function(grunt) { ...@@ -80,7 +95,9 @@ module.exports = function(grunt) {
server: { server: {
options: { options: {
port: port, port: port,
base: '.' base: '.',
livereload: true,
open: true
} }
} }
}, },
...@@ -97,14 +114,24 @@ module.exports = function(grunt) { ...@@ -97,14 +114,24 @@ module.exports = function(grunt) {
}, },
watch: { watch: {
main: { options: {
files: [ 'Gruntfile.js', 'js/reveal.js', 'css/reveal.css' ], livereload: true
tasks: 'default' },
js: {
files: [ 'Gruntfile.js', 'js/reveal.js' ],
tasks: 'js'
}, },
theme: { theme: {
files: [ 'css/theme/source/*.scss', 'css/theme/template/*.scss' ], files: [ 'css/theme/source/*.scss', 'css/theme/template/*.scss' ],
tasks: 'themes' tasks: 'css-themes'
} },
css: {
files: [ 'css/reveal.scss' ],
tasks: 'css-core'
},
html: {
files: [ 'index.html']
}
} }
}); });
...@@ -115,15 +142,25 @@ module.exports = function(grunt) { ...@@ -115,15 +142,25 @@ module.exports = function(grunt) {
grunt.loadNpmTasks( 'grunt-contrib-cssmin' ); grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
grunt.loadNpmTasks( 'grunt-contrib-uglify' ); grunt.loadNpmTasks( 'grunt-contrib-uglify' );
grunt.loadNpmTasks( 'grunt-contrib-watch' ); grunt.loadNpmTasks( 'grunt-contrib-watch' );
grunt.loadNpmTasks( 'grunt-contrib-sass' ); grunt.loadNpmTasks( 'grunt-sass' );
grunt.loadNpmTasks( 'grunt-contrib-connect' ); grunt.loadNpmTasks( 'grunt-contrib-connect' );
grunt.loadNpmTasks( 'grunt-autoprefixer' );
grunt.loadNpmTasks( 'grunt-zip' ); grunt.loadNpmTasks( 'grunt-zip' );
// Default task // Default task
grunt.registerTask( 'default', [ 'jshint', 'cssmin', 'uglify', 'qunit' ] ); grunt.registerTask( 'default', [ 'css', 'js' ] );
// JS task
grunt.registerTask( 'js', [ 'jshint', 'uglify', 'qunit' ] );
// Theme CSS
grunt.registerTask( 'css-themes', [ 'sass:themes' ] );
// Core framework CSS
grunt.registerTask( 'css-core', [ 'sass:core', 'autoprefixer', 'cssmin' ] );
// Theme task // All CSS
grunt.registerTask( 'themes', [ 'sass' ] ); grunt.registerTask( 'css', [ 'sass', 'autoprefixer', 'cssmin' ] );
// Package presentation to archive // Package presentation to archive
grunt.registerTask( 'package', [ 'default', 'zip' ] ); grunt.registerTask( 'package', [ 'default', 'zip' ] );
......
Copyright (C) 2014 Hakim El Hattab, http://hakim.se Copyright (C) 2015 Hakim El Hattab, http://hakim.se
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
A framework for easily creating beautiful presentations using HTML. [Check out the live demo](http://lab.hakim.se/reveal-js/). A framework for easily creating beautiful presentations using HTML. [Check out the live demo](http://lab.hakim.se/reveal-js/).
reveal.js comes with a broad range of features including [nested slides](https://github.com/hakimel/reveal.js#markup), [markdown contents](https://github.com/hakimel/reveal.js#markdown), [PDF export](https://github.com/hakimel/reveal.js#pdf-export), [speaker notes](https://github.com/hakimel/reveal.js#speaker-notes) and a [JavaScript API](https://github.com/hakimel/reveal.js#api). It's best viewed in a browser with support for CSS 3D transforms but [fallbacks](https://github.com/hakimel/reveal.js/wiki/Browser-Support) are available to make sure your presentation can still be viewed elsewhere. reveal.js comes with a broad range of features including [nested slides](https://github.com/hakimel/reveal.js#markup), [Markdown contents](https://github.com/hakimel/reveal.js#markdown), [PDF export](https://github.com/hakimel/reveal.js#pdf-export), [speaker notes](https://github.com/hakimel/reveal.js#speaker-notes) and a [JavaScript API](https://github.com/hakimel/reveal.js#api). It's best viewed in a modern browser but [fallbacks](https://github.com/hakimel/reveal.js/wiki/Browser-Support) are available to make sure your presentation can still be viewed elsewhere.
#### More reading: #### More reading:
...@@ -13,7 +13,7 @@ reveal.js comes with a broad range of features including [nested slides](https:/ ...@@ -13,7 +13,7 @@ reveal.js comes with a broad range of features including [nested slides](https:/
## Online Editor ## Online Editor
Presentations are written using HTML or markdown but there's also an online editor for those of you who prefer a graphical interface. Give it a try at [http://slid.es](http://slid.es). Presentations are written using HTML or Markdown but there's also an online editor for those of you who prefer a graphical interface. Give it a try at [http://slides.com](http://slides.com).
## Instructions ## Instructions
...@@ -59,8 +59,8 @@ When used locally, this feature requires that reveal.js [runs from a local web s ...@@ -59,8 +59,8 @@ When used locally, this feature requires that reveal.js [runs from a local web s
```html ```html
<section data-markdown="example.md" <section data-markdown="example.md"
data-separator="^\n\n\n" data-separator="^\n\n\n"
data-vertical="^\n\n" data-separator-vertical="^\n\n"
data-notes="^Note:" data-separator-notes="^Note:"
data-charset="iso-8859-15"> data-charset="iso-8859-15">
</section> </section>
``` ```
...@@ -136,6 +136,10 @@ Reveal.initialize({ ...@@ -136,6 +136,10 @@ Reveal.initialize({
// i.e. contained within a limited portion of the screen // i.e. contained within a limited portion of the screen
embedded: false, embedded: false,
// Flags if we should show a help overlay when the questionmark
// key is pressed
help: true,
// Number of milliseconds between automatically proceeding to the // Number of milliseconds between automatically proceeding to the
// next slide, disabled when set to 0, this value can be overwritten // next slide, disabled when set to 0, this value can be overwritten
// by using a data-autoslide attribute on your slides // by using a data-autoslide attribute on your slides
...@@ -154,13 +158,13 @@ Reveal.initialize({ ...@@ -154,13 +158,13 @@ Reveal.initialize({
previewLinks: false, previewLinks: false,
// Transition style // Transition style
transition: 'default', // default/cube/page/concave/zoom/linear/fade/none transition: 'default', // none/fade/slide/convex/concave/zoom
// Transition speed // Transition speed
transitionSpeed: 'default', // default/fast/slow transitionSpeed: 'default', // default/fast/slow
// Transition style for full page slide backgrounds // Transition style for full page slide backgrounds
backgroundTransition: 'default', // default/none/slide/concave/convex/zoom backgroundTransition: 'default', // none/fade/slide/convex/concave/zoom
// Number of slides away from the current that are visible // Number of slides away from the current that are visible
viewDistance: 3, viewDistance: 3,
...@@ -175,8 +179,6 @@ Reveal.initialize({ ...@@ -175,8 +179,6 @@ Reveal.initialize({
}); });
``` ```
Note that the new default vertical centering option will break compatibility with slides that were using transitions with backgrounds (`cube` and `page`). To restore the previous behavior, set `center` to `false`.
The configuration can be updated after initialization using the ```configure``` method: The configuration can be updated after initialization using the ```configure``` method:
...@@ -207,13 +209,13 @@ Reveal.initialize({ ...@@ -207,13 +209,13 @@ Reveal.initialize({
{ src: 'plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } }, { src: 'plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
// Zoom in and out with Alt+click // Zoom in and out with Alt+click
{ src: 'plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } }, { src: 'plugin/zoom-js/zoom.js', async: true },
// Speaker notes // Speaker notes
{ src: 'plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }, { src: 'plugin/notes/notes.js', async: true },
// Remote control your reveal.js presentation using a touch device // Remote control your reveal.js presentation using a touch device
{ src: 'plugin/remotes/remotes.js', async: true, condition: function() { return !!document.body.classList; } }, { src: 'plugin/remotes/remotes.js', async: true },
// MathJax // MathJax
{ src: 'plugin/math/math.js', async: true } { src: 'plugin/math/math.js', async: true }
...@@ -266,15 +268,20 @@ Reveal.configure({ ...@@ -266,15 +268,20 @@ Reveal.configure({
autoSlide: 5000 autoSlide: 5000
}); });
``` ```
When this is turned on a control element will appear that enables users to pause and resume auto-sliding. Alternatively, sliding can be paused or resumed by pressing »a« on the keyboard. Sliding is paused automatically as soon as the user starts navigating. You can disable these controls by specifying ```autoSlideStoppable: false``` in your reveal.js config.
When this is turned on a control element will appear that enables users to pause and resume auto-sliding. Sliding is also paused automatically as soon as the user starts navigating. You can disable these controls by specifying ```autoSlideStoppable: false``` in your reveal.js config. You can also override the slide duration for individual slides and fragments by using the ```data-autoslide``` attribute:
You can also override the slide duration for individual slides by using the ```data-autoslide``` attribute on individual sections:
```html ```html
<section data-autoslide="10000">This will remain on screen for 10 seconds</section> <section data-autoslide="2000">
<p>After 2 seconds the first fragment will be shown.</p>
<p class="fragment" data-autoslide="10000">After 10 seconds the next fragment will be shown.</p>
<p class="fragment">Now, the fragment is displayed for 2 seconds before the next slide is shown.</p>
</section>
``` ```
Whenever the auto-slide mode is resumed or paused the ```autoslideresumed``` and ```autoslidepaused``` events are fired.
### Keyboard Bindings ### Keyboard Bindings
...@@ -290,6 +297,23 @@ Reveal.configure({ ...@@ -290,6 +297,23 @@ Reveal.configure({
}); });
``` ```
### Lazy Loading
When working on presentation with a lot of media or iframe content it's important to load lazily. Lazy loading means that reveal.js will only load content for the few slides nearest to the current slide. The number of slides that are preloaded is determined by the `viewDistance` configuration option.
To enable lazy loading all you need to do is change your "src" attributes to "data-src" as shown below. This is supported for image, video, audio and iframe elements.
```html
<section>
<img data-src="image.png">
<iframe data-src="http://slides.com">
<video>
<source data-src="video.webm" type="video/webm" />
<source data-src="video.mp4" type="video/mp4" />
</video>
</section>
```
### API ### API
...@@ -308,6 +332,7 @@ Reveal.prevFragment(); ...@@ -308,6 +332,7 @@ Reveal.prevFragment();
Reveal.nextFragment(); Reveal.nextFragment();
Reveal.toggleOverview(); Reveal.toggleOverview();
Reveal.togglePause(); Reveal.togglePause();
Reveal.toggleAutoSlide();
// Retrieves the previous and current slide elements // Retrieves the previous and current slide elements
Reveal.getPreviousSlide(); Reveal.getPreviousSlide();
...@@ -320,6 +345,7 @@ Reveal.isFirstSlide(); ...@@ -320,6 +345,7 @@ Reveal.isFirstSlide();
Reveal.isLastSlide(); Reveal.isLastSlide();
Reveal.isOverview(); Reveal.isOverview();
Reveal.isPaused(); Reveal.isPaused();
Reveal.isAutoSliding();
``` ```
### Ready Event ### Ready Event
...@@ -359,7 +385,7 @@ Reveal.addEventListener( 'somestate', function() { ...@@ -359,7 +385,7 @@ Reveal.addEventListener( 'somestate', function() {
### Slide Backgrounds ### Slide Backgrounds
Slides are contained within a limited portion of the screen by default to allow them to fit any display and scale uniformly. You can apply full page background colors or images by applying a ```data-background``` attribute to your ```<section>``` elements. Below are a few examples. Slides are contained within a limited portion of the screen by default to allow them to fit any display and scale uniformly. You can apply full page backgrounds outside of the slide area by adding a ```data-background``` attribute to your ```<section>``` elements. Four different types of backgrounds are supported: color, image, video and iframe. Below are a few examples.
```html ```html
<section data-background="#ff0000"> <section data-background="#ff0000">
...@@ -371,6 +397,12 @@ Slides are contained within a limited portion of the screen by default to allow ...@@ -371,6 +397,12 @@ Slides are contained within a limited portion of the screen by default to allow
<section data-background="http://example.com/image.png" data-background-size="100px" data-background-repeat="repeat"> <section data-background="http://example.com/image.png" data-background-size="100px" data-background-repeat="repeat">
<h2>This background image will be sized to 100px and repeated.</h2> <h2>This background image will be sized to 100px and repeated.</h2>
</section> </section>
<section data-background-video="https://s3.amazonaws.com/static.slid.es/site/homepage/v1/homepage-video-editor.mp4,https://s3.amazonaws.com/static.slid.es/site/homepage/v1/homepage-video-editor.webm">
<h2>Video. Multiple sources can be defined using a comma separated list.</h2>
</section>
<section data-background-iframe="https://slides.com">
<h2>Embeds a web page as a background. Note that the page won't be interactive.</h2>
</section>
``` ```
Backgrounds transition using a fade animation by default. This can be changed to a linear sliding transition by passing ```backgroundTransition: 'slide'``` to the ```Reveal.initialize()``` call. Alternatively you can set ```data-background-transition``` on any section with a background to override that specific transition. Backgrounds transition using a fade animation by default. This can be changed to a linear sliding transition by passing ```backgroundTransition: 'slide'``` to the ```Reveal.initialize()``` call. Alternatively you can set ```data-background-transition``` on any section with a background to override that specific transition.
...@@ -390,7 +422,7 @@ Reveal.initialize({ ...@@ -390,7 +422,7 @@ Reveal.initialize({
parallaxBackgroundSize: '', // CSS syntax, e.g. "2100px 900px" - currently only pixels are supported (don't use % or auto) parallaxBackgroundSize: '', // CSS syntax, e.g. "2100px 900px" - currently only pixels are supported (don't use % or auto)
// This slide transition gives best results: // This slide transition gives best results:
transition: linear transition: 'slide'
}); });
``` ```
...@@ -561,9 +593,9 @@ Limitations: ...@@ -561,9 +593,9 @@ Limitations:
## PDF Export ## PDF Export
Presentations can be exported to PDF via a special print stylesheet. This feature requires that you use [Google Chrome](http://google.com/chrome). Presentations can be exported to PDF via a special print stylesheet. This feature requires that you use [Google Chrome](http://google.com/chrome).
Here's an example of an exported presentation that's been uploaded to SlideShare: http://www.slideshare.net/hakimel/revealjs-13872948. Here's an example of an exported presentation that's been uploaded to SlideShare: http://www.slideshare.net/hakimel/revealjs-300.
1. Open your presentation with [css/print/pdf.css](https://github.com/hakimel/reveal.js/blob/master/css/print/pdf.css) included on the page. The default index HTML lets you add *print-pdf* anywhere in the query to include the stylesheet, for example: [lab.hakim.se/reveal-js?print-pdf](http://lab.hakim.se/reveal-js?print-pdf). 1. Open your presentation with `print-pdf` included anywhere in the query string. This triggers the default index HTML to load the PDF print stylesheet ([css/print/pdf.css](https://github.com/hakimel/reveal.js/blob/master/css/print/pdf.css)). You can test this with [lab.hakim.se/reveal-js?print-pdf](http://lab.hakim.se/reveal-js?print-pdf).
2. Open the in-browser print dialog (CMD+P). 2. Open the in-browser print dialog (CMD+P).
3. Change the **Destination** setting to **Save as PDF**. 3. Change the **Destination** setting to **Save as PDF**.
4. Change the **Layout** to **Landscape**. 4. Change the **Layout** to **Landscape**.
...@@ -576,7 +608,9 @@ Here's an example of an exported presentation that's been uploaded to SlideShare ...@@ -576,7 +608,9 @@ Here's an example of an exported presentation that's been uploaded to SlideShare
The framework comes with a few different themes included: The framework comes with a few different themes included:
- default: Gray background, white text, blue links - black: Black background, white text, blue links (default theme)
- white: White background, black text, blue links
- league: Gray background, white text, blue links (default theme for reveal.js < 3.0.0)
- beige: Beige background, dark text, brown links - beige: Beige background, dark text, brown links
- sky: Blue background, thin white text, blue links - sky: Blue background, thin white text, blue links
- night: Black background, thick white text, orange links - night: Black background, thick white text, orange links
...@@ -584,10 +618,10 @@ The framework comes with a few different themes included: ...@@ -584,10 +618,10 @@ The framework comes with a few different themes included:
- simple: White background, black text, blue links - simple: White background, black text, blue links
- solarized: Cream-colored background, dark green text, blue links - solarized: Cream-colored background, dark green text, blue links
Each theme is available as a separate stylesheet. To change theme you will need to replace **default** below with your desired theme name in index.html: Each theme is available as a separate stylesheet. To change theme you will need to replace **black** below with your desired theme name in index.html:
```html ```html
<link rel="stylesheet" href="css/theme/default.css" id="theme"> <link rel="stylesheet" href="css/theme/black.css" id="theme">
``` ```
If you want to add a theme of your own see the instructions here: [/css/theme/README.md](https://github.com/hakimel/reveal.js/blob/master/css/theme/README.md). If you want to add a theme of your own see the instructions here: [/css/theme/README.md](https://github.com/hakimel/reveal.js/blob/master/css/theme/README.md).
...@@ -614,7 +648,7 @@ When used locally, this feature requires that reveal.js [runs from a local web s ...@@ -614,7 +648,7 @@ When used locally, this feature requires that reveal.js [runs from a local web s
If you're using the external Markdown plugin, you can add notes with the help of a special delimiter: If you're using the external Markdown plugin, you can add notes with the help of a special delimiter:
```html ```html
<section data-markdown="example.md" data-separator="^\n\n\n" data-vertical="^\n\n" data-notes="^Note:"></section> <section data-markdown="example.md" data-separator="^\n\n\n" data-separator-vertical="^\n\n" data-separator-notes="^Note:"></section>
# Title # Title
## Sub-title ## Sub-title
...@@ -683,7 +717,7 @@ Reveal.initialize({ ...@@ -683,7 +717,7 @@ Reveal.initialize({
// Don't forget to add the dependencies // Don't forget to add the dependencies
dependencies: [ dependencies: [
{ src: '//cdnjs.cloudflare.com/ajax/libs/socket.io/0.9.10/socket.io.min.js', async: true }, { src: '//cdnjs.cloudflare.com/ajax/libs/socket.io/0.9.16/socket.io.min.js', async: true },
{ src: 'plugin/multiplex/master.js', async: true }, { src: 'plugin/multiplex/master.js', async: true },
// and if you want speaker notes // and if you want speaker notes
...@@ -711,7 +745,7 @@ Reveal.initialize({ ...@@ -711,7 +745,7 @@ Reveal.initialize({
// Don't forget to add the dependencies // Don't forget to add the dependencies
dependencies: [ dependencies: [
{ src: '//cdnjs.cloudflare.com/ajax/libs/socket.io/0.9.10/socket.io.min.js', async: true }, { src: '//cdnjs.cloudflare.com/ajax/libs/socket.io/0.9.16/socket.io.min.js', async: true },
{ src: 'plugin/multiplex/client.js', async: true } { src: 'plugin/multiplex/client.js', async: true }
// other dependencies... // other dependencies...
...@@ -749,7 +783,7 @@ Reveal.initialize({ ...@@ -749,7 +783,7 @@ Reveal.initialize({
// Don't forget to add the dependencies // Don't forget to add the dependencies
dependencies: [ dependencies: [
{ src: '//cdnjs.cloudflare.com/ajax/libs/socket.io/0.9.10/socket.io.min.js', async: true }, { src: '//cdnjs.cloudflare.com/ajax/libs/socket.io/0.9.16/socket.io.min.js', async: true },
{ src: 'plugin/multiplex/client.js', async: true } { src: 'plugin/multiplex/client.js', async: true }
// other dependencies... // other dependencies...
...@@ -772,7 +806,7 @@ Reveal.initialize({ ...@@ -772,7 +806,7 @@ Reveal.initialize({
// Don't forget to add the dependencies // Don't forget to add the dependencies
dependencies: [ dependencies: [
{ src: '//cdnjs.cloudflare.com/ajax/libs/socket.io/0.9.10/socket.io.min.js', async: true }, { src: '//cdnjs.cloudflare.com/ajax/libs/socket.io/0.9.16/socket.io.min.js', async: true },
{ src: 'plugin/multiplex/master.js', async: true }, { src: 'plugin/multiplex/master.js', async: true },
{ src: 'plugin/multiplex/client.js', async: true } { src: 'plugin/multiplex/client.js', async: true }
...@@ -871,7 +905,7 @@ The core of reveal.js is very easy to install. You'll simply need to download a ...@@ -871,7 +905,7 @@ The core of reveal.js is very easy to install. You'll simply need to download a
### Full setup ### Full setup
Some reveal.js features, like external markdown and speaker notes, require that presentations run from a local web server. The following instructions will set up such a server as well as all of the development tasks needed to make edits to the reveal.js source code. Some reveal.js features, like external Markdown and speaker notes, require that presentations run from a local web server. The following instructions will set up such a server as well as all of the development tasks needed to make edits to the reveal.js source code.
1. Install [Node.js](http://nodejs.org/) 1. Install [Node.js](http://nodejs.org/)
...@@ -909,25 +943,8 @@ Some reveal.js features, like external markdown and speaker notes, require that ...@@ -909,25 +943,8 @@ Some reveal.js features, like external markdown and speaker notes, require that
- **lib/** All other third party assets (JavaScript, CSS, fonts) - **lib/** All other third party assets (JavaScript, CSS, fonts)
### Contributing
Please keep the [issue tracker](http://github.com/hakimel/reveal.js/issues) limited to **bug reports**, **feature requests** and **pull requests**. If you are reporting a bug make sure to include information about which browser and operating system you are using as well as the necessary steps to reproduce the issue.
If you have personal support questions use [StackOverflow](http://stackoverflow.com/questions/tagged/reveal.js).
#### Pull requests
- Should follow the coding style of the file you work in, most importantly:
- Tabs to indent
- Single-quoted strings
- Should be made towards the **dev branch**
- Should be submitted from a feature/topic branch (not your master)
- Should not include the minified **reveal.min.js** file
## License ## License
MIT licensed MIT licensed
Copyright (C) 2014 Hakim El Hattab, http://hakim.se Copyright (C) 2015 Hakim El Hattab, http://hakim.se
...@@ -6,171 +6,197 @@ ...@@ -6,171 +6,197 @@
manipulate this file as you see fit. */ manipulate this file as you see fit. */
/* SECTION 1: Set default width, margin, float, and @media print {
background. This prevents elements from extending