Merge branch 'master' of github.com:hakimel/reveal.js into dev
This commit is contained in:
commit
adf1a24f0a
|
@ -277,17 +277,17 @@ function linkify( selector ) {
|
||||||
<td>Apples</td>
|
<td>Apples</td>
|
||||||
<td>$1</td>
|
<td>$1</td>
|
||||||
<td>7</td>
|
<td>7</td>
|
||||||
<tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Lemonade</td>
|
<td>Lemonade</td>
|
||||||
<td>$2</td>
|
<td>$2</td>
|
||||||
<td>18</td>
|
<td>18</td>
|
||||||
<tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Bread</td>
|
<td>Bread</td>
|
||||||
<td>$3</td>
|
<td>$3</td>
|
||||||
<td>2</td>
|
<td>2</td>
|
||||||
<tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</section>
|
</section>
|
||||||
|
|
10
package.json
10
package.json
|
@ -7,7 +7,7 @@
|
||||||
"main": "js/reveal.js",
|
"main": "js/reveal.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "grunt test",
|
"test": "grunt test",
|
||||||
"start": ""
|
"start": "grunt serve"
|
||||||
},
|
},
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Hakim El Hattab",
|
"name": "Hakim El Hattab",
|
||||||
|
@ -40,10 +40,6 @@
|
||||||
"grunt": "~0.4.0",
|
"grunt": "~0.4.0",
|
||||||
"node-sass": "~0.9.3"
|
"node-sass": "~0.9.3"
|
||||||
},
|
},
|
||||||
"licenses": [
|
|
||||||
{
|
"license": "MIT"
|
||||||
"type": "MIT",
|
|
||||||
"url": "https://github.com/hakimel/reveal.js/blob/master/LICENSE"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,7 @@ var staticDir = express.static;
|
||||||
io = io.listen(app);
|
io = io.listen(app);
|
||||||
|
|
||||||
var opts = {
|
var opts = {
|
||||||
port: 1948,
|
port: process.env.PORT || 1948,
|
||||||
baseDir : __dirname + '/../../'
|
baseDir : __dirname + '/../../'
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user