Merge branch 'develop' of github.com:selz/plyr into develop

Conflicts:
	.gitignore

4 files changed, 37 insertions, 21 deletions

diff --git a/docs/src/js/docs.js b/docs/src/js/docs.js
index fa19a5b6..fd988ce3 100644
--- a/docs/src/js/docs.js
+++ b/docs/src/js/docs.js
@@ -15,8 +15,8 @@ plyr.setup({
 });
 
 // Google analytics 
-// For demo site (http://plyr.io) only
-if(document.domain === "plyr.io") {
+// For demo site (http://[www.]plyr.io) only
+if(document.domain.indexOf("plyr.io") > -1) {
 	(function(i,s,o,g,r,a,m){i.GoogleAnalyticsObject=r;i[r]=i[r]||function(){
 	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
 	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
diff --git a/docs/src/less/docs.less b/docs/src/less/docs.less
index 8e08546f..7cb191d7 100644
--- a/docs/src/less/docs.less
+++ b/docs/src/less/docs.less
@@ -31,9 +31,6 @@
 }
 
 // Base
-html {
-	//font-size: 62.5%;
-}
 body {
 	font-family: "Avenir", "Helvetica Neue", Helvetica, Arial, sans-serif;
 	background: #fff;
@@ -42,6 +39,22 @@ body {
 	color: #6D797F;
 }
 
+// Error page
+html.error,
+.error body {
+	height: 100%;
+}
+.error body {
+	width: 100%;
+	display: table;
+	table-layout: fixed;
+}
+.error main {
+	display: table-cell;
+	width: 100%;
+	vertical-align: middle;
+}
+
 // Type
 h1,
 h2 {
diff --git a/docs/src/less/lib/fontface.less b/docs/src/less/lib/fontface.less
index e4375177..704503d1 100644
--- a/docs/src/less/lib/fontface.less
+++ b/docs/src/less/lib/fontface.less
@@ -1,16 +1,16 @@
 @font-face {
 	font-family: "Avenir";
-	src: 	url("//cdn.sampotts.me/plyr/fonts/AvenirLTStd-Medium.woff2") format("woff2"), 
-			url("//cdn.sampotts.me/plyr/fonts/AvenirLTStd-Medium.woff") format("woff"), 
-			url("//cdn.sampotts.me/plyr/fonts/AvenirLTStd-Medium.ttf")  format("truetype");
+	src: 	url("//cdn.plyr.io/fonts/avenir-medium.woff2") format("woff2"), 
+			url("//cdn.plyr.io/fonts/avenir-medium.woff") format("woff"), 
+			url("//cdn.plyr.io/fonts/avenir-medium.ttf")  format("truetype");
 	font-style:   normal;
 	font-weight:  400;
 }
 @font-face {
 	font-family: "Avenir";
-	src: 	url("//cdn.sampotts.me/plyr/fonts/AvenirLTStd-Heavy.woff2") format("woff2"), 
-			url("//cdn.sampotts.me/plyr/fonts/AvenirLTStd-Heavy.woff") format("woff"), 
-			url("//cdn.sampotts.me/plyr/fonts/AvenirLTStd-Heavy.ttf")  format("truetype");
+	src: 	url("//cdn.plyr.io/fonts/avenir-bold.woff2") format("woff2"), 
+			url("//cdn.plyr.io/fonts/avenir-bold.woff") format("woff"), 
+			url("//cdn.plyr.io/fonts/avenir-bold.ttf")  format("truetype");
 	font-style:   normal;
 	font-weight:  600;
 }
\ No newline at end of file
diff --git a/docs/src/templates/controls.html b/docs/src/templates/controls.html
index 3970d143..afe8091b 100644
--- a/docs/src/templates/controls.html
+++ b/docs/src/templates/controls.html
@@ -1,5 +1,7 @@
 <div class="player-controls">
 	<div class="player-progress">
+		<label for="seek{id}" class="sr-only">Seek</label>
+		<input id="seek{id}" class="player-progress-seek" type="range" min="0" max="100" step="0.5" value="0" data-player="seek">
 		<progress class="player-progress-played" max="100" value="0">
 			<span>0</span>% played
 		</progress>
@@ -9,12 +11,12 @@
 	</div>
 	<span class="player-controls-playback">
 		<button type="button" data-player="restart">
-			<svg><use xlink:href="#icon-refresh"></use></svg>
+			<svg><use xlink:href="#icon-restart"></use></svg>
 			<span class="sr-only">Restart</span>
 		</button>
 		<button type="button" data-player="rewind">
 			<svg><use xlink:href="#icon-rewind"></use></svg>
-			<span class="sr-only">Rewind <span class="player-seek-time">{seektime}</span> seconds</span>
+			<span class="sr-only">Rewind {seektime} seconds</span>
 		</button>
 		<button type="button" data-player="play">
 			<svg><use xlink:href="#icon-play"></use></svg>
@@ -26,7 +28,7 @@
 		</button>
 		<button type="button" data-player="fast-forward">
 			<svg><use xlink:href="#icon-fast-forward"></use></svg>
-			<span class="sr-only">Fast forward <span class="player-seek-time">{seektime}</span> seconds</span>
+			<span class="sr-only">Fast forward {seektime} seconds</span>
 		</button>
 		<span class="player-time">
 			<span class="sr-only">Time</span>
@@ -37,22 +39,23 @@
 		<input class="inverted sr-only" id="mute{id}" type="checkbox" data-player="mute">
 		<label id="mute{id}" for="mute{id}">
 			<svg class="icon-muted"><use xlink:href="#icon-muted"></use></svg>
-			<svg><use xlink:href="#icon-sound"></use></svg>
-			<span class="sr-only">Mute</span>
+			<svg><use xlink:href="#icon-volume"></use></svg>
+			<span class="sr-only">Toggle Mute</span>
 		</label>
 
 		<label for="volume{id}" class="sr-only">Volume</label>
-		<input id="volume{id}" class="player-volume" type="range" min="0" max="10" value="5" data-player="volume">
+		<input id="volume{id}" class="player-volume" type="range" min="0" max="10" step="0.5" value="0" data-player="volume">
 
 		<input class="sr-only" id="captions{id}" type="checkbox" data-player="captions">
 		<label for="captions{id}">
-			<svg><use xlink:href="#icon-bubble"></use></svg>
-			<span class="sr-only">Captions</span>
+			<svg class="icon-captions-on"><use xlink:href="#icon-captions-on"></use></svg>
+			<svg><use xlink:href="#icon-captions-off"></use></svg>
+			<span class="sr-only">Toggle Captions</span>
 		</label>
 
 		<button type="button" data-player="fullscreen">
-			<svg class="icon-exit-fullscreen"><use xlink:href="#icon-collapse"></use></svg>
-			<svg><use xlink:href="#icon-expand"></use></svg>
+			<svg class="icon-exit-fullscreen"><use xlink:href="#icon-exit-fullscreen"></use></svg>
+			<svg><use xlink:href="#icon-enter-fullscreen"></use></svg>
 			<span class="sr-only">Toggle fullscreen</span>
 		</button>
 	</span>