merge

INSTALL.md

@@ -26,7 +26,7 @@ deploy it on Github Pages via the `gh-pages` branch.
   + Grunt will copy this dir as-is to the root of the deployed site
 
 ## Github token for Travis
-+ **Connect** [Travis](https://travis-ci.org) to your Github account, if you haven't already
++ **Connect** [Travis](https://travis-ci.com) to your Github account, if you haven't already
 + On Github, create an access token: *Settings* → *Developer Settings* → *Personal access tokens* → **Generate new token**
   + *Token description*: e.g., "Travis push to gh-pages"
   + *Select scopes*: check "**repo**"
@@ -36,7 +36,7 @@ deploy it on Github Pages via the `gh-pages` branch.
 + [Install](https://github.com/travis-ci/travis.rb#installation) the Travis **gem**
   + See note in the [travis-key script](travis-key) for details
 + Run `./travis-key` to [securely store the token in Travis](https://docs.travis-ci.com/user/encrypting-files/):
-+ Commit, **push**, and check the [build log](https://travis-ci.org/) for errors
++ Commit, **push**, and check the [build log](https://travis-ci.com/) for errors
 
 ## Bot user for Travis deploy
 If you don't want Travis to have full write-access 

README.md

@@ -1,7 +1,7 @@
 # Life Security
 ## Luke 12:22-34
 
-[![Build status](https://api.travis-ci.org/sermons/security.svg)](https://travis-ci.org/github/sermons/security)
+[![Build status](https://api.travis-ci.com/sermons/security.svg)](https://travis-ci.com/github/sermons/security)
 [![Node deps](https://david-dm.org/sermons/security.svg)](https://david-dm.org/sermons/security)
 [![Node devDeps](https://david-dm.org/sermons/security/dev-status.svg)](https://david-dm.org/sermons/security?type=dev)
 

package.json

@@ -7,7 +7,7 @@
     "luke",
     "money"
   ],
-  "version": "2.2.0",
+  "version": "2.2.3",
   "author": "Sean Ho <seanho@seanho.com> (http://seanho.com)",
   "config": {
     "pretty_url": "",
@@ -35,22 +35,30 @@
     "mathjax": "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/MathJax.js",
     "css": [
       {
-        "href": "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css",
-        "integrity": "sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0="
+        "href": "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/fontawesome.min.css",
+        "integrity": "sha256-CuUPKpitgFmSNQuPDL5cEfPOOJT/+bwUlhfumDJ9CI4="
+      },
+      {
+        "href": "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/solid.min.css",
+        "integrity": "sha256-pIAzc/BIIo/hSvtNEDIiMTBtR9EfK3COmnH2pt8cPDY="
+      },
+      {
+        "href": "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/brands.min.css",
+        "integrity": "sha256-wfbbsQFYKnizQi/WLPXS3wVDu0Dpi2yUQpZBDsb2H1s="
       },
       {
         "href": "https://cdnjs.cloudflare.com/ajax/libs/reveal.js/3.8.0/css/reveal.min.css",
         "integrity": "sha256-OxiHrn+gXudPDHxTvXiQzeFjZU/FllSSPmOOYAZ1O/g="
       },
       {
-        "href": "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.0.3/styles/atom-one-dark.min.css",
+        "href": "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/styles/atom-one-dark.min.css",
         "integrity": "sha256-91Q4dP2FrFQCLpK/8fPlQyatehNmhUOXKRFM1CtE7Sw="
       }
     ],
     "js": [
       {
-        "src": "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.0.3/highlight.min.js",
-        "integrity": "sha256-/2C3CAfmuTGkUqK2mVrhkTacBscoR1caE0u2QZZ3Uh8="
+        "src": "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/highlight.min.js",
+        "integrity": "sha256-Uv3H6lx7dJmRfRvH8TH6kJD1TSK1aFcwgx+mdg3epi8="
       },
       {
         "src": "https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.3.0/socket.io.slim.js",
@@ -61,8 +69,8 @@
         "integrity": "sha256-pv4AarTAzSO6lz+bbMPwmV29XMjkzmFOn601b2pWqXE="
       },
       {
-        "src": "https://cdnjs.cloudflare.com/ajax/libs/marked/1.0.0/marked.min.js",
-        "integrity": "sha256-JUIJCIbiDdnT6IGIU/ZbydNyumUIMsEelMTrSfDb1Sc="
+        "src": "https://cdnjs.cloudflare.com/ajax/libs/marked/1.1.0/marked.min.js",
+        "integrity": "sha256-POA+Q3FC8tyo/jZhQrw40H5mKcWAABdxNeUQ/uhIm4U="
       },
       {
         "src": "https://cdnjs.cloudflare.com/ajax/libs/reveal.js/3.8.0/plugin/markdown/markdown.min.js",
@@ -78,14 +86,15 @@
   "private": true,
   "dependencies": {
     "reveal.js": "^3.8.0",
-    "highlight.js": "^10.0.3",
+    "highlight.js": "^10.1.1",
     "socket.io": "^2.3.0",
-    "marked": "^1.0.0"
+    "marked": "^1.1.0"
   },
   "devDependencies": {
-    "grunt": "^1.1.0",
+    "grunt": "^1.2.1",
+    "coffeescript": "^2.5.1",
     "load-grunt-tasks": "^5.1.0",
-    "grunt-contrib-connect": "^2.1.0",
+    "grunt-contrib-connect": "^3.0.0",
     "grunt-contrib-copy": "^1.0.0",
     "node-sass": "^4.14.1",
     "grunt-sass": "^3.1.0",

slides/sample.md

@@ -2,7 +2,7 @@
 # Reveal-Skel
 ## A template for Reveal.js-based presentations
 
-[![Travis](https://api.travis-ci.org/sermons/reveal-skel.svg)](https://travis-ci.org/github/sermons/reveal-skel)
+[![Travis](https://api.travis-ci.com/sermons/reveal-skel.svg)](https://travis-ci.com/github/sermons/reveal-skel)
 [![Node deps](https://david-dm.org/sermons/reveal-skel.svg)](https://david-dm.org/sermons/reveal-skel)
 [![Node devDeps](https://david-dm.org/sermons/reveal-skel/dev-status.svg)](https://david-dm.org/sermons/reveal-skel?type=dev)
 

static/css/slides.css

@@ -115,9 +115,11 @@ section[data-background-image],
 
 #footer .commit {
   font-size: 0.75em;
-  opacity: 0.2;
+  opacity: 0.4;
 }
 
+#footer a { color: white }
+
 /* Placeholder if Javascript is disabled */
 noscript .noscript {
   padding: 20% 5%;

template/index.html

@@ -40,14 +40,12 @@ <h1><%= pkg.description %></h1>
       <div id="footer"><%= pkg.config.pretty_url %>
         <span class="links">
           <a href="<%= pkg.shortname %>.pdf">
-            <i class="fa fa-file-pdf-o fa-inverse"></i></a>
-          <a href="https://github.com/<%= pkg.repository %>">
-            <i class="fa fa-github fa-inverse"></i></a>
+            <i class="fas fa-file-pdf"></i></a>
 	  <a href="<%= process.env.TRAVIS_BUILD_WEB_URL %>">
-            <i class="fa fa-hammer fa-inverse"></i></a>
+            <i class="fas fa-hammer"></i></a>
         </span>
         <span class="commit">
-          <a href="https://github.com/<%= pkg.repository %>"><%= pkg.commit %></a>
+          <a href="https://github.com/<%= pkg.repository %>/commit/<%= pkg.commit %>"><%= pkg.commit %></a>
 	</span>
       </div>