Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Chris Lawrence 2014-04-13 14:05:51 -04:00
commit ac76644456
9 changed files with 30 additions and 24 deletions

View File

@ -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) 2013 Hakim El Hattab, http://hakim.se\n' + ' * Copyright (C) 2014 Hakim El Hattab, http://hakim.se\n' +
' */' ' */'
}, },

View File

@ -1,4 +1,4 @@
Copyright (C) 2013 Hakim El Hattab, http://hakim.se Copyright (C) 2014 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

View File

@ -878,28 +878,28 @@ Some reveal.js features, like external markdown and speaker notes, require that
2. Install [Grunt](http://gruntjs.com/getting-started#installing-the-cli) 2. Install [Grunt](http://gruntjs.com/getting-started#installing-the-cli)
4. Clone the reveal.js repository 4. Clone the reveal.js repository
```sh ```sh
$ git clone https://github.com/hakimel/reveal.js.git $ git clone https://github.com/hakimel/reveal.js.git
``` ```
5. Navigate to the reveal.js folder 5. Navigate to the reveal.js folder
```sh ```sh
$ cd reveal.js $ cd reveal.js
``` ```
6. Install dependencies 6. Install dependencies
```sh ```sh
$ npm install $ npm install
``` ```
7. Serve the presentation and monitor source files for changes 7. Serve the presentation and monitor source files for changes
```sh ```sh
$ grunt serve $ grunt serve
``` ```
8. Open <http://localhost:8000> to view your presentation 8. Open <http://localhost:8000> to view your presentation
You can change the port by using `grunt serve --port 8001`. You can change the port by using `grunt serve --port 8001`.
### Folder Structure ### Folder Structure
@ -930,4 +930,4 @@ If you have personal support questions use [StackOverflow](http://stackoverflow.
MIT licensed MIT licensed
Copyright (C) 2013 Hakim El Hattab, http://hakim.se Copyright (C) 2014 Hakim El Hattab, http://hakim.se

View File

@ -5,7 +5,7 @@
* http://lab.hakim.se/reveal-js * http://lab.hakim.se/reveal-js
* MIT licensed * MIT licensed
* *
* Copyright (C) 2013 Hakim El Hattab, http://hakim.se * Copyright (C) 2014 Hakim El Hattab, http://hakim.se
*/ */

2
css/reveal.min.css vendored

File diff suppressed because one or more lines are too long

View File

@ -20,9 +20,15 @@
<!-- For syntax highlighting --> <!-- For syntax highlighting -->
<link rel="stylesheet" href="lib/css/zenburn.css"> <link rel="stylesheet" href="lib/css/zenburn.css">
<!-- If the query includes 'print-pdf', use the PDF print sheet --> <!-- If the query includes 'print-pdf', include the PDF print sheet -->
<script> <script>
document.write( '<link rel="stylesheet" href="css/print/' + ( window.location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' ); if( window.location.search.match( /print-pdf/gi ) ) {
var link = document.createElement( 'link' );
link.rel = 'stylesheet';
link.type = 'text/css';
link.href = 'css/print/pdf.css';
document.getElementsByTagName( 'head' )[0].appendChild( link );
}
</script> </script>
<!--[if lt IE 9]> <!--[if lt IE 9]>

View File

@ -3,7 +3,7 @@
* http://lab.hakim.se/reveal-js * http://lab.hakim.se/reveal-js
* MIT licensed * MIT licensed
* *
* Copyright (C) 2013 Hakim El Hattab, http://hakim.se * Copyright (C) 2014 Hakim El Hattab, http://hakim.se
*/ */
var Reveal = (function(){ var Reveal = (function(){

4
js/reveal.min.js vendored

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{ {
"name": "reveal.js", "name": "reveal.js",
"version": "2.6.1", "version": "2.6.2",
"description": "The HTML Presentation Framework", "description": "The HTML Presentation Framework",
"homepage": "http://lab.hakim.se/reveal-js", "homepage": "http://lab.hakim.se/reveal-js",
"subdomain": "revealjs", "subdomain": "revealjs",