aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHakim El Hattab <hakim.elhattab@gmail.com>2015-06-25 10:02:21 +0200
committerHakim El Hattab <hakim.elhattab@gmail.com>2015-06-25 10:02:21 +0200
commitadf1a24f0a88dc5095521faab474dabe5e926b2d (patch)
treef8ca0da552200b74991001dc21ea2ff1cbc22e80
parent6ec6ac2cb4223484026f1bc52bba369f56eac9fa (diff)
parent7225d84248466b713c3a00c5e6cca40cf868bfe6 (diff)
downloadperl-software-in-gnu-guix-adf1a24f0a88dc5095521faab474dabe5e926b2d.tar
perl-software-in-gnu-guix-adf1a24f0a88dc5095521faab474dabe5e926b2d.tar.gz
Merge branch 'master' of github.com:hakimel/reveal.js into dev
-rw-r--r--index.html6
-rw-r--r--package.json10
-rw-r--r--plugin/multiplex/index.js2
3 files changed, 7 insertions, 11 deletions
diff --git a/index.html b/index.html
index ee90cc9..aad2046 100644
--- a/index.html
+++ b/index.html
@@ -277,17 +277,17 @@ function linkify( selector ) {
<td>Apples</td>
<td>$1</td>
<td>7</td>
- <tr>
+ </tr>
<tr>
<td>Lemonade</td>
<td>$2</td>
<td>18</td>
- <tr>
+ </tr>
<tr>
<td>Bread</td>
<td>$3</td>
<td>2</td>
- <tr>
+ </tr>
</tbody>
</table>
</section>
diff --git a/package.json b/package.json
index 201c6bf..fc70464 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
"main": "js/reveal.js",
"scripts": {
"test": "grunt test",
- "start": ""
+ "start": "grunt serve"
},
"author": {
"name": "Hakim El Hattab",
@@ -40,10 +40,6 @@
"grunt": "~0.4.0",
"node-sass": "~0.9.3"
},
- "licenses": [
- {
- "type": "MIT",
- "url": "https://github.com/hakimel/reveal.js/blob/master/LICENSE"
- }
- ]
+
+ "license": "MIT"
}
diff --git a/plugin/multiplex/index.js b/plugin/multiplex/index.js
index 6f5d8b1..af058ed 100644
--- a/plugin/multiplex/index.js
+++ b/plugin/multiplex/index.js
@@ -9,7 +9,7 @@ var staticDir = express.static;
io = io.listen(app);
var opts = {
- port: 1948,
+ port: process.env.PORT || 1948,
baseDir : __dirname + '/../../'
};