Fix for control tooltips always showing

Update bundles.json - Fix path to sass dir.

.jshintrc

@@ -9,8 +9,7 @@
     "rhino"         : false,
     "couch"         : false,
     "wsh"           : true,   // Windows Scripting Host.
-    "jquery"        : true,
-    "predef"        : [ "jQuery", "$" ],
+    "jquery"        : false,
 
     // Development.
     "debug"         : false,  // Allow debugger statements e.g. browser breakpoints.
@@ -51,6 +50,6 @@
     "plusplus"      : false,  // Prohibit use of `++` & `--`.
     "sub"           : false,  // Tolerate all forms of subscript notation besides dot notation e.g. `dict['key']` instead of `dict.key`.
     "trailing"      : true,   // Prohibit trailing whitespaces.
-    "white"         : false,  // Check against strict whitespace and indentation rules.
-    "indent"        : 2       // Specify indentation spacing
+    "white"         : true,  // Check against strict whitespace and indentation rules.
+    "indent"        : 4       // Specify indentation spacing
 }

bundles.json

@@ -4,7 +4,7 @@
             "plyr.css":     ["src/less/plyr.less"]
         },
         "sass": {
-            "plyr.css":     ["src/less/plyr.sass"]
+            "plyr.css":     ["src/sass/plyr.sass"]
         },
         "js": {
             "plyr.js":      ["src/js/plyr.js"]
@@ -16,11 +16,9 @@
         },
         "js": {
             "docs.js": [
-                "docs/src/js/lib/hogan-3.0.2.mustache.js",
                 "docs/src/js/lib/classlist.js",
-                "docs/dist/templates.js",
                 "docs/src/js/docs.js"
             ]
         }
     }
-}
+}

changelog.md

@@ -1,5 +1,82 @@
 # Changelog
 
+## v1.5.7
+- Fix for control tooltips always showing
+
+## v1.5.6
+- Seek tooltip (option for tooltips changed, please check docs)
+- SASS compile error fixes (fixes #148)
+- Fullscreen fixes for controls not always hiding/showing (fixes #149)
+- Screen reader icon fixes (title was being read twice due to the tooltip/hidden label)
+
+## v1.5.5
+- Fixed controls.md example
+- Bug fix for docs error page
+- Bug fix for controls tooltips
+
+## v1.5.4
+- Minor bug fix for clicking video to play/pause after source change
+
+## v1.5.3
+- Minor bug fix for occasional display of 0:00 as the media duration
+
+## v1.5.2
+- `handlers` option renamed to `listeners`
+- Added event listeners for all types to the plyr container (playback, fullscreen, captions etc - see docs)
+- Removed onSetup config option (use the 'setup' event instead, plyr element is event.plyr)
+- Style bug fixes
+- Vimeo seek bug fix (requires whole seconds when seeking)
+- Fix for fullscreen player (using class hook, not browser fullscreen)
+
+## v1.5.1
+- Fix for event listeners being duplicated on source change
+
+# v1.5.0
+- Vimeo support (fixes #8)
+- New options for initialization (you can now pass a selector, HTMLElement or NodeList) (fixes #118)
+- Switched to BEM methodology (you will need to change CSS and probably HTML)
+- Decoupled CSS and JS hooks (fixes #129)
+- Custom controls container (fixes #98)
+- Fix for private/incognito mode local storage bug (fixes #131)
+- UMD module setup (fixes #121)
+- Specify iframe title for Vimeo and YouTube (fixes #124)
+- Better handling of mission controls (fixes #132)
+- Retain classname on source change (fixes #120)
+- Increased thumb size on seek (partially fixes #130)
+- Passing no argument to `source` api method, now returns current source (by @gurupras)
+- Ability to add custom handlers to controls prior to Plyr bindings (by @gurupras)
+- Keyboard navigation improvements (focus on seek, focus trap in fullscreen) (fixes #135)
+
+## v1.3.5
+- Fixed bug with API use on basic supported browsers
+
+## v1.3.4
+- Code cleanup by @calvintam236
+
+## v1.3.3
+- Removed captions being read by screen readers
+
+## v1.3.2
+- Voiceover fix for captions
+
+## v1.3.1
+- ARIA improvements for captions being read
+
+## v1.3.0
+- Internationalization support (i18n) using default controls (required markup changes to controls)
+- ARIA enhancements for controls (required markup changes to controls)
+- Captions legibility improvements
+- YouTube bug fixes
+
+## v1.2.6
+- SASS updates and fixes (cheers @ChristianPV)
+
+## v1.2.5
+- Fix for YouTube quality (let them decide quality)
+
+## v1.2.4
+- Fix for omitted kind attribute on <track> (fixes #88)
+
 ## v1.2.3
 - Fix for YouTube on iPhone or unsupported browsers (fallback to YouTube native)
 - Docs tidy up
@@ -12,7 +89,7 @@
 ## v1.2.1
 - Tooltip bug fix
 
-## v1.2.0
+# v1.2.0
 - Added YouTube support
 
 ## v1.1.13
@@ -25,10 +102,10 @@
 - Bug fix for Chrome Canary
 
 ## v1.1.11
-- Bug fix 
+- Bug fix
 
 ## v1.1.10
-- Bug fix 
+- Bug fix
 
 ## v1.1.9
 - Bug fix for 1.1.8

controls.md

@@ -1,86 +1,115 @@
-# Controls HTML
+# Controls
 
-This is the markup that is rendered for the Plyr controls. You can use the default controls or provide a customized version of markup based on your needs. 
+This is the markup that is rendered for the Plyr controls. You can use the default controls or provide a customized version of markup based on your needs.
 
-The demo Plyr setup uses a Hogan template. This purely to allow for localization at a later date. Check out `controls.html` in `/src/templates` to get an idea of how the default html is structured.
+## Internationalization using default controls
 
-## Requirements
+You can provide an `i18n` object as one of your options when initialising the plugin which we be used when rendering the controls.
 
-The classes and data attributes used in your template should match the `selectors` option. 
+### Example
+
+```javascript
+i18n: {
+    restart:            "Restart",
+    rewind:             "Rewind {seektime} secs",
+    play:               "Play",
+    pause:              "Pause",
+    forward:            "Forward {seektime} secs",
+    played:             "played",
+    buffered:           "buffered",
+    currentTime:        "Current time",
+    duration:           "Duration",
+    volume:             "Volume",
+    toggleMute:         "Toggle Mute",
+    toggleCaptions:     "Toggle Captions",
+    toggleFullscreen:   "Toggle Fullscreen"
+}
+```
+
+Note: `{seektime}` will be replaced with your configured seek time or the default. For example "Forward {seektime} secs" would render as "Forward 10 secs".
+
+## Using custom HTML
+
+You can specify the HTML for the controls using the `html` option.
+
+The classes and data attributes used in your template should match the `selectors` option.
 
 You need to add several placeholders to your html template that are replaced when rendering:
 
 - `{id}` - the dynamically generated ID for the player (for form controls)
 - `{seektime}` - the seek time specified in options for fast forward and rewind
 
-You can include only the controls you need when specifying custom html. 
+You can include only the controls you need when specifying custom html.
 
-## Example
+### Example
 
 This is an example `html` option with all controls.
 
 ```javascript
-["<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'>",
+var controls = ["<div class='plyr__controls'>",
+    "<div class='plyr__progress'>",
+        "<label for='seek{id}' class='plyr__sr-only'>Seek</label>",
+        "<input id='seek{id}' class='plyr__progress--seek' type='range' min='0' max='100' step='0.1' value='0' data-plyr='seek'>",
+        "<progress class='plyr__progress--played' max='100' value='0'>",
             "<span>0</span>% played",
         "</progress>",
-        "<progress class='player-progress-buffer' max='100' value='0'>",
+        "<progress class='plyr__progress--buffer' max='100' value='0'>",
             "<span>0</span>% buffered",
         "</progress>",
     "</div>",
-    "<span class='player-controls-left'>",
-        "<button type='button' data-player='restart'>",
+    "<span class='plyr__controls--left'>",
+        "<button type='button' data-plyr='restart'>",
             "<svg><use xlink:href='#icon-restart'></use></svg>",
-            "<span class='sr-only'>Restart</span>",
+            "<span class='plyr__sr-only'>Restart</span>",
         "</button>",
-        "<button type='button' data-player='rewind'>",
+        "<button type='button' data-plyr='rewind'>",
             "<svg><use xlink:href='#icon-rewind'></use></svg>",
-            "<span class='sr-only'>Rewind {seektime} secs</span>",
+            "<span class='plyr__sr-only'>Rewind {seektime} secs</span>",
         "</button>",
-        "<button type='button' data-player='play'>",
+        "<button type='button' data-plyr='play'>",
             "<svg><use xlink:href='#icon-play'></use></svg>",
-            "<span class='sr-only'>Play</span>",
+            "<span class='plyr__sr-only'>Play</span>",
         "</button>",
-        "<button type='button' data-player='pause'>",
+        "<button type='button' data-plyr='pause'>",
             "<svg><use xlink:href='#icon-pause'></use></svg>",
-            "<span class='sr-only'>Pause</span>",
+            "<span class='plyr__sr-only'>Pause</span>",
         "</button>",
-        "<button type='button' data-player='fast-forward'>",
+        "<button type='button' data-plyr='fast-forward'>",
             "<svg><use xlink:href='#icon-fast-forward'></use></svg>",
-            "<span class='sr-only'>Forward {seektime} secs</span>",
+            "<span class='plyr__sr-only'>Forward {seektime} secs</span>",
         "</button>",
-        "<span class='player-time'>",
-            "<span class='sr-only'>Current time</span>",
-            "<span class='player-current-time'>00:00</span>",
+        "<span class='plyr__time'>",
+            "<span class='plyr__sr-only'>Current time</span>",
+            "<span class='plyr__current-time'>00:00</span>",
         "</span>",
-        "<span class='player-time'>",
-            "<span class='sr-only'>Duration</span>",
-            "<span class='player-duration'>00:00</span>",
+        "<span class='plyr__time'>",
+            "<span class='plyr__sr-only'>Duration</span>",
+            "<span class='plyr__duration'>00:00</span>",
         "</span>",
     "</span>",
-    "<span class='player-controls-right'>",
-        "<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>",
+    "<span class='plyr__controls--right'>",
+        "<button type='button' data-plyr='mute'>",
+            "<svg class='icon--muted'><use xlink:href='#icon-muted'></use></svg>",
             "<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 class='sr-only' id='captions{id}' type='checkbox' data-player='captions'>",
-        "<label for='captions{id}'>",
-            "<svg class='icon-captions-on'><use xlink:href='#icon-captions-on'></use></svg>",
+            "<span class='plyr__sr-only'>Toggle Mute</span>",
+        "</button>",
+        "<label for='volume{id}' class='plyr__sr-only'>Volume</label>",
+        "<input id='volume{id}' class='plyr__volume' type='range' min='0' max='10' value='5' data-plyr='volume'>",
+        "<button type='button' data-plyr='captions'>",
+            "<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-exit-fullscreen'></use></svg>",
+            "<span class='plyr__sr-only'>Toggle Captions</span>",
+        "</button>",
+        "<button type='button' data-plyr='fullscreen'>",
+            "<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>",
+            "<span class='plyr__sr-only'>Toggle Fullscreen</span>",
         "</button>",
     "</span>",
 "</div>"].join("\n");
-```
+
+// Setup the player
+plyr.setup('.js-player', {
+    html: controls
+});
+```

docs/dist/docs.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg"><symbol id="icon-github" viewBox="0 0 16 16"><path fill-rule="evenodd" clip-rule="evenodd" d="M8 .2c-4.4 0-8 3.6-8 8 0 3.5 2.3 6.5 5.5 7.6.4.1.5-.2.5-.4V14c-2.2.5-2.7-1-2.7-1-.4-.9-.9-1.2-.9-1.2-.7-.5.1-.5.1-.5.8.1 1.2.8 1.2.8.7 1.3 1.9.9 2.3.7.1-.5.3-.9.5-1.1-1.8-.2-3.6-.9-3.6-4 0-.9.3-1.6.8-2.1-.1-.2-.4-1 .1-2.1 0 0 .7-.2 2.2.8.6-.2 1.3-.3 2-.3s1.4.1 2 .3c1.5-1 2.2-.8 2.2-.8.4 1.1.2 1.9.1 2.1.5.6.8 1.3.8 2.1 0 3.1-1.9 3.7-3.7 3.9.3.4.6.9.6 1.6v2.2c0 .2.1.5.6.4 3.2-1.1 5.5-4.1 5.5-7.6-.1-4.4-3.7-8-8.1-8z"/></symbol><symbol id="icon-twitter" viewBox="0 0 16 16"><title>Twitter</title><path d="M16 3c-.6.3-1.2.4-1.9.5.7-.4 1.2-1 1.4-1.8-.6.4-1.3.6-2.1.8-.6-.6-1.5-1-2.4-1-1.7 0-3.2 1.5-3.2 3.3 0 .3 0 .5.1.7-2.7-.1-5.2-1.4-6.8-3.4-.3.5-.4 1-.4 1.7 0 1.1.6 2.1 1.5 2.7-.5 0-1-.2-1.5-.4C.7 7.7 1.8 9 3.3 9.3c-.3.1-.6.1-.9.1-.2 0-.4 0-.6-.1.4 1.3 1.6 2.3 3.1 2.3-1.1.9-2.5 1.4-4.1 1.4H0c1.5.9 3.2 1.5 5 1.5 6 0 9.3-5 9.3-9.3v-.4C15 4.3 15.6 3.7 16 3z"/></symbol><symbol id="icon-vimeo" viewBox="0 0 16 16"><path d="M16 4.3c-.1 1.6-1.2 3.7-3.3 6.4-2.2 2.8-4 4.2-5.5 4.2-.9 0-1.7-.9-2.4-2.6C4 9.9 3.4 5 2 5c-.1 0-.5.3-1.2.8l-.8-1c.8-.7 3.5-3.4 4.7-3.5 1.2-.1 2 .7 2.3 2.5.3 2 .8 6.1 1.8 6.1.9 0 2.5-3.4 2.6-4 .1-.9-.3-1.9-2.3-1.1.8-2.6 2.3-3.8 4.5-3.8 1.7.1 2.5 1.2 2.4 3.3z"/></symbol><symbol id="icon-youtube" viewBox="0 0 16 16"><path d="M15.8 4.8c-.2-1.3-.8-2.2-2.2-2.4C11.4 2 8 2 8 2s-3.4 0-5.6.4C1 2.6.3 3.5.2 4.8 0 6.1 0 8 0 8s0 1.9.2 3.2c.2 1.3.8 2.2 2.2 2.4C4.6 14 8 14 8 14s3.4 0 5.6-.4c1.4-.3 2-1.1 2.2-2.4C16 9.9 16 8 16 8s0-1.9-.2-3.2zM6 11V5l5 3-5 3z"/></symbol></svg>

docs/dist/templates.js

@@ -1,2 +0,0 @@
-    var templates = {};
-    templates['controls'] = new Hogan.Template({code: function (c,p,i) { var t=this;t.b(i=i||"");t.b("<div class=\"player-controls\">");t.b("\n" + i);t.b("    <div class=\"player-progress\">");t.b("\n" + i);t.b("        <label for=\"seek{id}\" class=\"sr-only\">Seek</label>");t.b("\n" + i);t.b("        <input id=\"seek{id}\" class=\"player-progress-seek\" type=\"range\" min=\"0\" max=\"100\" step=\"0.5\" value=\"0\" data-player=\"seek\">");t.b("\n" + i);t.b("        <progress class=\"player-progress-played\" max=\"100\" value=\"0\">");t.b("\n" + i);t.b("            <span>0</span>% played");t.b("\n" + i);t.b("        </progress>");t.b("\n" + i);t.b("        <progress class=\"player-progress-buffer\" max=\"100\" value=\"0\">");t.b("\n" + i);t.b("            <span>0</span>% buffered");t.b("\n" + i);t.b("        </progress>");t.b("\n" + i);t.b("    </div>");t.b("\n" + i);t.b("    <span class=\"player-controls-left\">");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"restart\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-restart\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Restart</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"rewind\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-rewind\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Rewind {seektime} secs</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"play\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-play\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Play</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"pause\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-pause\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Pause</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"fast-forward\">");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-fast-forward\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Forward {seektime} secs</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("        <span class=\"player-time\">");t.b("\n" + i);t.b("            <span class=\"sr-only\">Current time</span>");t.b("\n" + i);t.b("            <span class=\"player-current-time\">00:00</span>");t.b("\n" + i);t.b("        </span>");t.b("\n" + i);t.b("        <span class=\"player-time\">");t.b("\n" + i);t.b("            <span class=\"sr-only\">Duration</span>");t.b("\n" + i);t.b("            <span class=\"player-duration\">00:00</span>");t.b("\n" + i);t.b("        </span>");t.b("\n" + i);t.b("    </span>");t.b("\n" + i);t.b("    <span class=\"player-controls-right\">");t.b("\n" + i);t.b("        <input class=\"inverted sr-only\" id=\"mute{id}\" type=\"checkbox\" data-player=\"mute\">");t.b("\n" + i);t.b("        <label id=\"mute{id}\" for=\"mute{id}\">");t.b("\n" + i);t.b("            <svg class=\"icon-muted\"><use xlink:href=\"#icon-muted\"></use></svg>");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-volume\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Toggle Mute</span>");t.b("\n" + i);t.b("        </label>");t.b("\n");t.b("\n" + i);t.b("        <label for=\"volume{id}\" class=\"sr-only\">Volume</label>");t.b("\n" + i);t.b("        <input id=\"volume{id}\" class=\"player-volume\" type=\"range\" min=\"0\" max=\"10\" step=\"0.5\" value=\"0\" data-player=\"volume\">");t.b("\n");t.b("\n" + i);t.b("        <input class=\"sr-only\" id=\"captions{id}\" type=\"checkbox\" data-player=\"captions\">");t.b("\n" + i);t.b("        <label for=\"captions{id}\">");t.b("\n" + i);t.b("            <svg class=\"icon-captions-on\"><use xlink:href=\"#icon-captions-on\"></use></svg>");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-captions-off\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Toggle Captions</span>");t.b("\n" + i);t.b("        </label>");t.b("\n");t.b("\n" + i);t.b("        <button type=\"button\" data-player=\"fullscreen\">");t.b("\n" + i);t.b("            <svg class=\"icon-exit-fullscreen\"><use xlink:href=\"#icon-exit-fullscreen\"></use></svg>");t.b("\n" + i);t.b("            <svg><use xlink:href=\"#icon-enter-fullscreen\"></use></svg>");t.b("\n" + i);t.b("            <span class=\"sr-only\">Toggle Fullscreen</span>");t.b("\n" + i);t.b("        </button>");t.b("\n" + i);t.b("    </span>");t.b("\n" + i);t.b("</div>");return t.fl(); },partials: {}, subs: {  }});

docs/error.html

@@ -6,13 +6,13 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
         <!-- Docs styles -->
-        <link rel="stylesheet" href="//cdn.plyr.io/1.2.3/docs.css">
+        <link rel="stylesheet" href="dist/docs.css">
     </head>
     <body>
         <main>
             <h1>Doh.</h1>
             <p>Looks like something went wrong.</p>
-            <a href="http://plyr.io" class="btn">Back to plyr.io</a>
+            <a href="http://plyr.io" class="btn btn--primary">Back to plyr.io</a>
         </main>
     </body>
-</html>
+</html>

docs/index.html

@@ -8,102 +8,120 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
         <!-- Styles -->
-        <link rel="stylesheet" href="https://cdn.plyr.io/1.2.3/plyr.css?1">
+        <link rel="stylesheet" href="../dist/plyr.css">
 
         <!-- Docs styles -->
-        <link rel="stylesheet" href="https://cdn.plyr.io/1.2.3/docs.css?4">
+        <link rel="stylesheet" href="dist/docs.css">
     </head>
     <body>
         <header>
             <h1>Plyr</h1>
-            <p>A simple HTML5 media player with custom controls and WebVTT captions by <a href="https://twitter.com/sam_potts" target="_blank">@sam_potts</a></p>
+            <p>A simple, accessible HTML5 media player by <a href="https://twitter.com/sam_potts" target="_blank">@sam_potts</a> from <a href="https://twitter.com/selz" target="_blank">@selz</a></p>
             <nav>
                 <ul>
                     <li>
-                        <a href="https://github.com/selz/plyr" target="_blank" class="btn btn-primary">Download on GitHub</a>
-                        <span class="btn-count js-stargazers-count">&hellip;</span>
+                        <a href="https://github.com/selz/plyr" target="_blank" class="btn btn--large btn--primary" data-shr-network="github">
+                            <svg class="icon"><use xlink:href="#icon-github"/></svg>Download on GitHub
+                        </a>
                     </li>
                     <li>
-                        <a href="https://twitter.com/intent/tweet?text=A+simple+HTML5+media+player+with+custom+controls+and+WebVTT+captions.&url=http%3A%2F%2Fplyr.io&via=Sam_Potts" target="_blank" class="btn js-popup" data-window-height="250" data-window-width="500">Tweet</a>
-                        <span class="btn-count js-tweet-count">&hellip;</span>
+                        <a href="https://twitter.com/intent/tweet?text=A+simple+HTML5+media+player+with+custom+controls+and+WebVTT+captions.&url=http%3A%2F%2Fplyr.io&via=Sam_Potts" target="_blank" class="btn btn--large btn--twitter" data-shr-network="twitter">
+                            <svg class="icon"><use xlink:href="#icon-twitter"/></svg>Tweet
+                        </a>
                     </li>
                 </ul>
             </nav>
         </header>
 
         <main role="main" id="main">
-            <nav class="btn-bar nav-panel">
+            <nav class="btn__bar">
                 <ul>
-                    <li><a href="#video" class="btn active btn-small">Video</a></li>
-                    <li><a href="#youtube" class="btn btn-small">YouTube</a></li>
-                    <li><a href="#audio" class="btn btn-small">Audio</a></li>
+                    <li class="active">
+                        <button type="button" class="btn" data-source="video">Video</button>
+                    </li>
+                    <li>
+                        <button type="button" class="btn" data-source="audio">Audio</button>
+                    </li>
+                    <li>
+                        <button type="button" class="btn btn--youtube" data-source="youtube"><svg class="icon"><use xlink:href="#icon-youtube"/></svg>YouTube</button>
+                    </li>
+                    <li>
+                        <button type="button" class="btn btn--vimeo" data-source="vimeo"><svg class="icon"><use xlink:href="#icon-vimeo"/></svg>Vimeo</button>
+                    </li>
                 </ul>
             </nav>
-            <div class="panels">
-                <section class="panel example-video active" id="video">
-                    <div class="player">
-                        <video poster="https://cdn.plyr.io/static/poster.jpg" controls crossorigin>
-                            <!-- Video files -->
-                            <source src="https://cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
-                            <source src="https://cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
-                            
-                            <!-- Text track file -->
-                            <track kind="captions" label="English" srclang="en" src="https://cdn.selz.com/plyr/1.0/en.vtt" default>
-                            
-                            <!-- Fallback for browsers that don't support the <video> element -->
-                            <a href="https://cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
-                        </video>
-                    </div>
-                    <small>Big Buck Bunny. More info can be found at <a href="https://peach.blender.org" target="_blank">peach.blender.org</a>.</small>
-                </section>
-                <section class="panel example-video" id="youtube">
-                    <div class="player">
-                        <div data-video-id="Au87oAJ2jeE" data-type="youtube"></div>
-                    </div>
-                    <small>Envato's "Made By" interview of <a href="https://www.youtube.com/watch?v=Au87oAJ2jeE" target="_blank">Dan Cederholm</a> from <a href="https://dribbble.com" target="_blank">Dribbble</a>.</small>
-                </section>
-                <section class="panel example-audio" id="audio">
-                    <div class="player">
-                        <audio controls>
-                            <!-- Audio files -->
-                            <source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3" type="audio/mp3">
-                            <source src="//cdn.selz.com/plyr/1.0/logistics-96-sample.ogg" type="audio/ogg">
-                            
-                            <!-- Fallback for browsers that don't support the <audio> element -->
-                            <a href="//cdn.selz.com/plyr/1.0/logistics-96-sample.mp3">Download</a>
-                        </audio>
-                    </div>
-                    <small>"96" by Logistics, which can be purchased from <a href="https://www.hospitalrecords.com/shop/artist/logistics" target="_blank">Hospital Records</a>.</small>
-                </section>
-            </div>
+            <section>
+                <div class="js-media-player">
+                    <video poster="https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.jpg" controls crossorigin>
+                        <!-- Video files -->
+                        <source src="https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.mp4" type="video/mp4">
+                        <source src="https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.webm" type="video/webm">
+
+                        <!-- Text track file -->
+                        <track kind="captions" label="English" srclang="en" src="https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.vtt" default>
+
+                        <!-- Fallback for browsers that don't support the <video> element -->
+                        <a href="https://cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
+                    </video>
+                </div>
+
+                <ul>
+                    <li class="plyr__cite plyr__cite--video"><small><a href="http://viewfromabluemoon.com/" target="_blank">View From A Blue Moon</a> &copy; Brainfarm</small></li>
+                    <li class="plyr__cite plyr__cite--audio"><small><a href="http://www.kishibashi.com/" target="_blank">Kishi Bashi &ndash; &ldquo;It All Began With A Burst&rdquo;</a> &copy; Kishi Bashi</small></li>
+                    <li class="plyr__cite plyr__cite--youtube"><small><a href="https://www.youtube.com/watch?v=bTqVqk7FSmY" target="_blank">View From A Blue Moon</a> on <span class="color--youtube"><svg class="icon"><use xlink:href="#icon-youtube"/></svg>YouTube</span></small>
+                    <li class="plyr__cite plyr__cite--vimeo"><small><a href="https://vimeo.com/ondemand/viewfromabluemoon4k" target="_blank">View From A Blue Moon</a> on <span class="color--vimeo"><svg class="icon"><use xlink:href="#icon-vimeo"/></svg>Vimeo</span></small>
+                </ul>
+            </section>
         </main>
 
         <!-- Load SVG defs -->
         <!-- You should bundle all SVG/Icons into one file using a build tool such as gulp and svg store -->
         <script>
-        (function(d, u){
-            var a = new XMLHttpRequest(),
-                b = d.body;
+        (function() {
+            [
+                '../dist/sprite.svg',
+                'dist/docs.svg'
+            ]
+            .forEach(function(u) {
+                var x = new XMLHttpRequest(),
+                    b = document.body;
 
-            // Check for CORS support
-            // If you're loading from same domain, you can remove the if statement
-            if("withCredentials" in a) {
-                a.open("GET", u, true);
-                a.send();
-                a.onload = function(){
-                    var c = d.createElement("div");
-                    c.setAttribute("hidden", "");
-                    c.innerHTML = a.responseText;
+                // Check for CORS support
+                // If you're loading from same domain, you can remove the whole if/else statement
+                // XHR for Chrome/Firefox/Opera/Safari/IE10+
+                if ('withCredentials' in x) {
+                    x.open('GET', u, true);
+                }
+                // XDomainRequest for IE8 & IE9
+                else if (typeof XDomainRequest == 'function') {
+                    x = new XDomainRequest();
+                    x.open('GET', u);
+                }
+                else { return; }
+
+                // Inject hidden div with sprite on load
+                x.onload = function() {
+                    var c = document.createElement('div');
+                    c.setAttribute('hidden', '');
+                    c.innerHTML = x.responseText;
                     b.insertBefore(c, b.childNodes[0]);
                 }
-            }
-        })(document, "https://cdn.plyr.io/1.2.3/sprite.svg");
+
+                // Timeout for IE9
+        		setTimeout(function () {
+        			x.send();
+        		}, 0);
+            });
+        })();
         </script>
 
         <!-- Plyr core script -->
-        <script src="https://cdn.plyr.io/1.2.3/plyr.js?1"></script>
+        <script src="../dist/plyr.js"></script>
+
+        <!-- Shr core script -->
+        <script src="https://cdn.shr.one/0.1.9/shr.js"></script>
 
         <!-- Docs script -->
-        <script src="https://cdn.plyr.io/1.2.3/docs.js?1"></script>
+        <script src="dist/docs.js"></script>
     </body>
 </html>

docs/src/js/docs.js

@@ -2,182 +2,179 @@
 // Docs example
 // ==========================================================================
 
-/*global plyr, templates */
+/*global plyr, shr*/
 
 // Setup the player
-plyr.setup({
-	debug: 	true,
-	volume: 9,
-	title: 	"Video demo",
-	html: 	templates.controls.render({}),
-	tooltips: true,
-	captions: {
-		defaultActive: true
+plyr.setup('.js-media-player', {
+	debug: 				true,
+	title: 				'Video demo',
+	tooltips: 	{
+		controls: 		true
 	},
-	onSetup: function() {
-		if(!("media" in this)) {
-			return;
-		}
+	captions: {
+		defaultActive: 	true
+	}
+});
 
-		var player 	= this,
-			type 	= player.media.tagName.toLowerCase(),
-			toggle 	= document.querySelector("[data-toggle='fullscreen']");
-
-		console.log("✓ Setup done for <" + type + ">");
-
-		if(type === "video" && toggle) {
-			toggle.addEventListener("click", player.toggleFullscreen, false);
-		}
+// Setup shr
+shr.setup({
+	count: {
+		classname: 'btn__count'
 	}
 });
 
 // General functions
-(function() { 
-	// Popup
-	function popup(event) {
-		// Prevent the link opening
-		if(event.target.nodeName.toLowerCase() == "a") {
-			if(event.preventDefault) { 
-				event.preventDefault();
-			}
-			else {
-				event.returnValue = false;
-			}
-		}
+(function() {
+	var buttons = document.querySelectorAll('[data-source]'),
+		types = {
+			video: 		'video',
+			audio: 		'audio',
+			youtube: 	'youtube',
+			vimeo: 		'vimeo'
+		},
+		currentType = window.location.hash.replace('#', ''),
+		historySupport = (window.history && window.history.pushState);
 
-		var link 	= event.target,
-			url		= link.href,
-			width 	= link.getAttribute("data-window-width") || 600,
-			height 	= link.getAttribute("data-window-height") || 600,
-			name 	= link.getAttribute("data-window-name") || "popup";
+	// Bind to each button
+	for (var i = buttons.length - 1; i >= 0; i--) {
+		buttons[i].addEventListener('click', function() {
+			var type = this.getAttribute('data-source');
 
-		// If window exists, just focus it
-		if(window["window-"+name] && !window["window-"+name].closed) {
-			window["window-"+name].focus();
-		}
-		else {
-			// Get position
-			var left = window.screenLeft !== undefined ? window.screenLeft : screen.left;
-			var top = window.screenTop !== undefined ? window.screenTop : screen.top;
+			newSource(type);
 
-			// Open in the centre of the screen
-			var x = (screen.width / 2) - (width / 2) + left,
-				y = (screen.height / 2) - (height / 2) + top;
-
-			// Open that window
-			window["window-"+name] = window.open(url, name, "top=" + y +",left="+ x +",width=" + width + ",height=" + height);
-
-			// Focus new window
-			window["window-"+name].focus();
-		}
-	}
-
-	// Trigger popups
-	document.querySelector(".js-popup").addEventListener("click", popup);
-
-	// Get JSONP
-	function getJSONP(url, callback) {
-	    var name = "jsonp_callback_" + Math.round(100000 * Math.random());
-
-	    // Cleanup to prevent memory leaks and hit original callback
-	    window[name] = function(data) {
-	        delete window[name];
-	        document.body.removeChild(script);
-	        callback(data);
-	    };
-
-	    // Create a faux script
-	    var script = document.createElement("script");
-	    script.setAttribute("src", url + (url.indexOf("?") >= 0 ? "&" : "?") + "callback=" + name);
-
-	    // Inject to the body
-	    document.body.appendChild(script);
-	}
-
-	// Get star count
-	var storageSupported = ("sessionStorage" in window),
-		selectors = {
-			github: 	".js-stargazers-count",
-			twitter: 	".js-tweet-count"
-		};
-
-	// Display the count next to the button
-	function displayCount(selector, count) {
-		document.querySelector(selector).innerHTML = count;
-	}
-
-	// Add star
-	function formatGitHubCount(count) {
-		return "&#9733; " + count;
-	}
-
-	// Check if it's in session storage first
-	if(storageSupported && "github_stargazers" in window.sessionStorage) {
-		displayCount(selectors.github, formatGitHubCount(window.sessionStorage.github_stargazers));
-	}
-	else {
-		getJSONP("https://api.github.com/repos/selz/plyr?access_token=a46ac653210ba6a6be44260c29c333470c3fbbf5", function (json) {
-			if (json && typeof json.data.stargazers_count !== "undefined") {
-				// Update UI 
-				displayCount(selectors.github, formatGitHubCount(json.data.stargazers_count));
-
-				// Store in session storage
-				window.sessionStorage.github_stargazers = json.data.stargazers_count;
+			if (historySupport) {
+				history.pushState({ 'type': type }, '', '#' + type);
 			}
 		});
 	}
 
-	// Get tweet count
-	if(storageSupported && "tweets" in window.sessionStorage) {
-		displayCount(selectors.twitter, window.sessionStorage.tweets);
-	}
-	else {
-		getJSONP("https://cdn.api.twitter.com/1/urls/count.json?url=plyr.io", function (json) {
-			if (json && typeof json.count !== "undefined") {
-				// Update UI 
-				displayCount(selectors.twitter, json.count);
+	// List for backwards/forwards
+	window.addEventListener('popstate', function(event) {
+		if(event.state && 'type' in event.state) {
+			newSource(event.state.type);
+		}
+	});
 
-				// Store in session storage
-				window.sessionStorage.tweets = json.count;
-			}
-		});
+	// On load
+	if(historySupport) {
+		var video = !currentType.length;
+		if(video) {
+			currentType = types.video;
+		}
+		if(currentType in types) {
+			history.replaceState({ 'type': currentType }, '', (video ? '' : '#' + currentType));
+		}
+		if(!video) {
+			newSource(currentType, true);
+		}
 	}
 
-	// Tabs
-	var tabs = document.querySelectorAll(".nav-panel a"),
-		panels = document.querySelectorAll(".panels > .panel"),
-		activeClass = "active";
+	// Toggle class on an element
+	function toggleClass(element, className, state) {
+        if (element) {
+            if (element.classList) {
+                element.classList[state ? 'add' : 'remove'](className);
+            }
+            else {
+                var name = (' ' + element.className + ' ').replace(/\s+/g, ' ').replace(' ' + className + ' ', '');
+                element.className = name + (state ? ' ' + className : '');
+            }
+        }
+    }
 
-	for (var i = tabs.length - 1; i >= 0; i--) {
-		tabs[i].addEventListener("click", togglePanel);
-	}
-
-	function togglePanel(event) {
-		event.preventDefault();
-
-		var tab = event.target,
-			panel = document.querySelector(tab.getAttribute("href"));
-
-		for (var i = panels.length - 1; i >= 0; i--) {
-			panels[i].classList.remove(activeClass);
+	// Set a new source
+	function newSource(type, init) {
+		// Bail if new type isn't known, it's the current type, or current type is empty (video is default) and new type is video
+		if(!(type in types) || (!init && type == currentType) || (!currentType.length && type == types.video)) {
+			console.warn('Unregonized type.');
+			return;
 		}
 
-		for (var x = tabs.length - 1; x >= 0; x--) {
-			tabs[x].classList.remove(activeClass);
+		// Get plyr instance
+		var player = document.querySelector('.js-media-player').plyr;
+
+		switch(type) {
+			case types.video:
+				player.source({
+					type:       'video',
+					title: 		'View From A Blue Moon',
+					sources: [{
+						src:    'https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.mp4',
+						type:   'video/mp4'
+					},
+					{
+						src:    'https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.webm',
+						type:   'video/webm'
+					}],
+					poster:     'https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.jpg',
+					tracks:     [{
+						kind:   'captions',
+						label:  'English',
+						srclang:'en',
+						src:    'https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.vtt',
+						default: true
+					}]
+				});
+				break;
+
+			case types.audio:
+				player.source({
+					type:       'audio',
+					title: 		'Kishi Bashi &ndash; &ldquo;It All Began With A Burst&rdquo;',
+					sources: [{
+						src:    'https://cdn.selz.com/plyr/1.5/Kishi_Bashi_-_It_All_Began_With_a_Burst.mp3',
+						type:   'audio/mp3'
+					},
+					{
+						src:    'https://cdn.selz.com/plyr/1.5/Kishi_Bashi_-_It_All_Began_With_a_Burst.ogg',
+						type:   'audio/ogg'
+					}]
+				});
+				break;
+
+			case types.youtube:
+				player.source({
+					type:       'video',
+					title: 		'View From A Blue Moon',
+					sources: [{
+				        src:    'bTqVqk7FSmY',
+				        type:   'youtube'
+				    }]
+				});
+				break;
+
+			case types.vimeo:
+				player.source({
+					type:       'video',
+					title: 		'View From A Blue Moon',
+					sources: [{
+				        src:    '143418951',
+				        type:   'vimeo'
+				    }]
+				});
+				break;
 		}
 
-		panel.classList.add(activeClass);
-		event.target.classList.add(activeClass);
+		// Set the current type for next time
+		currentType = type;
+
+		// Remove active classes
+		for (var x = buttons.length - 1; x >= 0; x--) {
+			toggleClass(buttons[x].parentElement, 'active', false);
+		}
+
+		// Set active on parent
+		toggleClass(document.querySelector('[data-source="'+ type +'"]').parentElement, 'active', true);
 	}
 })();
 
-// Google analytics 
+// Google analytics
 // For demo site (http://[www.]plyr.io) only
-if(document.domain.indexOf("plyr.io") > -1) {
+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)
-	})(window,document,"script","//www.google-analytics.com/analytics.js","ga");
-	ga("create", "UA-40881672-11", "auto");
-	ga("send", "pageview");
-}
+	})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+	ga('create', 'UA-40881672-11', 'auto');
+	ga('send', 'pageview');
+}

docs/src/js/lib/hogan-3.0.2.mustache.js

@@ -1,802 +0,0 @@
-/*!
- *  Copyright 2011 Twitter, Inc.
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-// A wrapper for compatibility with Mustache.js, quirks and all
-
-
-
-var Hogan = {};
-
-(function (Hogan) {
-  Hogan.Template = function (codeObj, text, compiler, options) {
-    codeObj = codeObj || {};
-    this.r = codeObj.code || this.r;
-    this.c = compiler;
-    this.options = options || {};
-    this.text = text || '';
-    this.partials = codeObj.partials || {};
-    this.subs = codeObj.subs || {};
-    this.buf = '';
-  }
-
-  Hogan.Template.prototype = {
-    // render: replaced by generated code.
-    r: function (context, partials, indent) { return ''; },
-
-    // variable escaping
-    v: hoganEscape,
-
-    // triple stache
-    t: coerceToString,
-
-    render: function render(context, partials, indent) {
-      return this.ri([context], partials || {}, indent);
-    },
-
-    // render internal -- a hook for overrides that catches partials too
-    ri: function (context, partials, indent) {
-      return this.r(context, partials, indent);
-    },
-
-    // ensurePartial
-    ep: function(symbol, partials) {
-      var partial = this.partials[symbol];
-
-      // check to see that if we've instantiated this partial before
-      var template = partials[partial.name];
-      if (partial.instance && partial.base == template) {
-        return partial.instance;
-      }
-
-      if (typeof template == 'string') {
-        if (!this.c) {
-          throw new Error("No compiler available.");
-        }
-        template = this.c.compile(template, this.options);
-      }
-
-      if (!template) {
-        return null;
-      }
-
-      // We use this to check whether the partials dictionary has changed
-      this.partials[symbol].base = template;
-
-      if (partial.subs) {
-        // Make sure we consider parent template now
-        if (!partials.stackText) partials.stackText = {};
-        for (key in partial.subs) {
-          if (!partials.stackText[key]) {
-            partials.stackText[key] = (this.activeSub !== undefined && partials.stackText[this.activeSub]) ? partials.stackText[this.activeSub] : this.text;
-          }
-        }
-        template = createSpecializedPartial(template, partial.subs, partial.partials,
-          this.stackSubs, this.stackPartials, partials.stackText);
-      }
-      this.partials[symbol].instance = template;
-
-      return template;
-    },
-
-    // tries to find a partial in the current scope and render it
-    rp: function(symbol, context, partials, indent) {
-      var partial = this.ep(symbol, partials);
-      if (!partial) {
-        return '';
-      }
-
-      return partial.ri(context, partials, indent);
-    },
-
-    // render a section
-    rs: function(context, partials, section) {
-      var tail = context[context.length - 1];
-
-      if (!isArray(tail)) {
-        section(context, partials, this);
-        return;
-      }
-
-      for (var i = 0; i < tail.length; i++) {
-        context.push(tail[i]);
-        section(context, partials, this);
-        context.pop();
-      }
-    },
-
-    // maybe start a section
-    s: function(val, ctx, partials, inverted, start, end, tags) {
-      var pass;
-
-      if (isArray(val) && val.length === 0) {
-        return false;
-      }
-
-      if (typeof val == 'function') {
-        val = this.ms(val, ctx, partials, inverted, start, end, tags);
-      }
-
-      pass = !!val;
-
-      if (!inverted && pass && ctx) {
-        ctx.push((typeof val == 'object') ? val : ctx[ctx.length - 1]);
-      }
-
-      return pass;
-    },
-
-    // find values with dotted names
-    d: function(key, ctx, partials, returnFound) {
-      var found,
-          names = key.split('.'),
-          val = this.f(names[0], ctx, partials, returnFound),
-          doModelGet = this.options.modelGet,
-          cx = null;
-
-      if (key === '.' && isArray(ctx[ctx.length - 2])) {
-        val = ctx[ctx.length - 1];
-      } else {
-        for (var i = 1; i < names.length; i++) {
-          found = findInScope(names[i], val, doModelGet);
-          if (found !== undefined) {
-            cx = val;
-            val = found;
-          } else {
-            val = '';
-          }
-        }
-      }
-
-      if (returnFound && !val) {
-        return false;
-      }
-
-      if (!returnFound && typeof val == 'function') {
-        ctx.push(cx);
-        val = this.mv(val, ctx, partials);
-        ctx.pop();
-      }
-
-      return val;
-    },
-
-    // find values with normal names
-    f: function(key, ctx, partials, returnFound) {
-      var val = false,
-          v = null,
-          found = false,
-          doModelGet = this.options.modelGet;
-
-      for (var i = ctx.length - 1; i >= 0; i--) {
-        v = ctx[i];
-        val = findInScope(key, v, doModelGet);
-        if (val !== undefined) {
-          found = true;
-          break;
-        }
-      }
-
-      if (!found) {
-        return (returnFound) ? false : "";
-      }
-
-      if (!returnFound && typeof val == 'function') {
-        val = this.mv(val, ctx, partials);
-      }
-
-      return val;
-    },
-
-    // higher order templates
-    ls: function(func, cx, partials, text, tags) {
-      var oldTags = this.options.delimiters;
-
-      this.options.delimiters = tags;
-      this.b(this.ct(coerceToString(func.call(cx, text)), cx, partials));
-      this.options.delimiters = oldTags;
-
-      return false;
-    },
-
-    // compile text
-    ct: function(text, cx, partials) {
-      if (this.options.disableLambda) {
-        throw new Error('Lambda features disabled.');
-      }
-      return this.c.compile(text, this.options).render(cx, partials);
-    },
-
-    // template result buffering
-    b: function(s) { this.buf += s; },
-
-    fl: function() { var r = this.buf; this.buf = ''; return r; },
-
-    // method replace section
-    ms: function(func, ctx, partials, inverted, start, end, tags) {
-      var textSource,
-          cx = ctx[ctx.length - 1],
-          result = func.call(cx);
-
-      if (typeof result == 'function') {
-        if (inverted) {
-          return true;
-        } else {
-          textSource = (this.activeSub && this.subsText && this.subsText[this.activeSub]) ? this.subsText[this.activeSub] : this.text;
-          return this.ls(result, cx, partials, textSource.substring(start, end), tags);
-        }
-      }
-
-      return result;
-    },
-
-    // method replace variable
-    mv: function(func, ctx, partials) {
-      var cx = ctx[ctx.length - 1];
-      var result = func.call(cx);
-
-      if (typeof result == 'function') {
-        return this.ct(coerceToString(result.call(cx)), cx, partials);
-      }
-
-      return result;
-    },
-
-    sub: function(name, context, partials, indent) {
-      var f = this.subs[name];
-      if (f) {
-        this.activeSub = name;
-        f(context, partials, this, indent);
-        this.activeSub = false;
-      }
-    }
-
-  };
-
-  //Find a key in an object
-  function findInScope(key, scope, doModelGet) {
-    var val;
-
-    if (scope && typeof scope == 'object') {
-
-      if (scope[key] !== undefined) {
-        val = scope[key];
-
-      // try lookup with get for backbone or similar model data
-      } else if (doModelGet && scope.get && typeof scope.get == 'function') {
-        val = scope.get(key);
-      }
-    }
-
-    return val;
-  }
-
-  function createSpecializedPartial(instance, subs, partials, stackSubs, stackPartials, stackText) {
-    function PartialTemplate() {};
-    PartialTemplate.prototype = instance;
-    function Substitutions() {};
-    Substitutions.prototype = instance.subs;
-    var key;
-    var partial = new PartialTemplate();
-    partial.subs = new Substitutions();
-    partial.subsText = {};  //hehe. substext.
-    partial.buf = '';
-
-    stackSubs = stackSubs || {};
-    partial.stackSubs = stackSubs;
-    partial.subsText = stackText;
-    for (key in subs) {
-      if (!stackSubs[key]) stackSubs[key] = subs[key];
-    }
-    for (key in stackSubs) {
-      partial.subs[key] = stackSubs[key];
-    }
-
-    stackPartials = stackPartials || {};
-    partial.stackPartials = stackPartials;
-    for (key in partials) {
-      if (!stackPartials[key]) stackPartials[key] = partials[key];
-    }
-    for (key in stackPartials) {
-      partial.partials[key] = stackPartials[key];
-    }
-
-    return partial;
-  }
-
-  var rAmp = /&/g,
-      rLt = /</g,
-      rGt = />/g,
-      rApos = /\'/g,
-      rQuot = /\"/g,
-      hChars = /[&<>\"\']/;
-
-  function coerceToString(val) {
-    return String((val === null || val === undefined) ? '' : val);
-  }
-
-  function hoganEscape(str) {
-    str = coerceToString(str);
-    return hChars.test(str) ?
-      str
-        .replace(rAmp, '&amp;')
-        .replace(rLt, '&lt;')
-        .replace(rGt, '&gt;')
-        .replace(rApos, '&#39;')
-        .replace(rQuot, '&quot;') :
-      str;
-  }
-
-  var isArray = Array.isArray || function(a) {
-    return Object.prototype.toString.call(a) === '[object Array]';
-  };
-
-})(typeof exports !== 'undefined' ? exports : Hogan);
-
-
-
-(function (Hogan) {
-  // Setup regex  assignments
-  // remove whitespace according to Mustache spec
-  var rIsWhitespace = /\S/,
-      rQuot = /\"/g,
-      rNewline =  /\n/g,
-      rCr = /\r/g,
-      rSlash = /\\/g,
-      rLineSep = /\u2028/,
-      rParagraphSep = /\u2029/;
-
-  Hogan.tags = {
-    '#': 1, '^': 2, '<': 3, '$': 4,
-    '/': 5, '!': 6, '>': 7, '=': 8, '_v': 9,
-    '{': 10, '&': 11, '_t': 12
-  };
-
-  Hogan.scan = function scan(text, delimiters) {
-    var len = text.length,
-        IN_TEXT = 0,
-        IN_TAG_TYPE = 1,
-        IN_TAG = 2,
-        state = IN_TEXT,
-        tagType = null,
-        tag = null,
-        buf = '',
-        tokens = [],
-        seenTag = false,
-        i = 0,
-        lineStart = 0,
-        otag = '{{',
-        ctag = '}}';
-
-    function addBuf() {
-      if (buf.length > 0) {
-        tokens.push({tag: '_t', text: new String(buf)});
-        buf = '';
-      }
-    }
-
-    function lineIsWhitespace() {
-      var isAllWhitespace = true;
-      for (var j = lineStart; j < tokens.length; j++) {
-        isAllWhitespace =
-          (Hogan.tags[tokens[j].tag] < Hogan.tags['_v']) ||
-          (tokens[j].tag == '_t' && tokens[j].text.match(rIsWhitespace) === null);
-        if (!isAllWhitespace) {
-          return false;
-        }
-      }
-
-      return isAllWhitespace;
-    }
-
-    function filterLine(haveSeenTag, noNewLine) {
-      addBuf();
-
-      if (haveSeenTag && lineIsWhitespace()) {
-        for (var j = lineStart, next; j < tokens.length; j++) {
-          if (tokens[j].text) {
-            if ((next = tokens[j+1]) && next.tag == '>') {
-              // set indent to token value
-              next.indent = tokens[j].text.toString()
-            }
-            tokens.splice(j, 1);
-          }
-        }
-      } else if (!noNewLine) {
-        tokens.push({tag:'\n'});
-      }
-
-      seenTag = false;
-      lineStart = tokens.length;
-    }
-
-    function changeDelimiters(text, index) {
-      var close = '=' + ctag,
-          closeIndex = text.indexOf(close, index),
-          delimiters = trim(
-            text.substring(text.indexOf('=', index) + 1, closeIndex)
-          ).split(' ');
-
-      otag = delimiters[0];
-      ctag = delimiters[delimiters.length - 1];
-
-      return closeIndex + close.length - 1;
-    }
-
-    if (delimiters) {
-      delimiters = delimiters.split(' ');
-      otag = delimiters[0];
-      ctag = delimiters[1];
-    }
-
-    for (i = 0; i < len; i++) {
-      if (state == IN_TEXT) {
-        if (tagChange(otag, text, i)) {
-          --i;
-          addBuf();
-          state = IN_TAG_TYPE;
-        } else {
-          if (text.charAt(i) == '\n') {
-            filterLine(seenTag);
-          } else {
-            buf += text.charAt(i);
-          }
-        }
-      } else if (state == IN_TAG_TYPE) {
-        i += otag.length - 1;
-        tag = Hogan.tags[text.charAt(i + 1)];
-        tagType = tag ? text.charAt(i + 1) : '_v';
-        if (tagType == '=') {
-          i = changeDelimiters(text, i);
-          state = IN_TEXT;
-        } else {
-          if (tag) {
-            i++;
-          }
-          state = IN_TAG;
-        }
-        seenTag = i;
-      } else {
-        if (tagChange(ctag, text, i)) {
-          tokens.push({tag: tagType, n: trim(buf), otag: otag, ctag: ctag,
-                       i: (tagType == '/') ? seenTag - otag.length : i + ctag.length});
-          buf = '';
-          i += ctag.length - 1;
-          state = IN_TEXT;
-          if (tagType == '{') {
-            if (ctag == '}}') {
-              i++;
-            } else {
-              cleanTripleStache(tokens[tokens.length - 1]);
-            }
-          }
-        } else {
-          buf += text.charAt(i);
-        }
-      }
-    }
-
-    filterLine(seenTag, true);
-
-    return tokens;
-  }
-
-  function cleanTripleStache(token) {
-    if (token.n.substr(token.n.length - 1) === '}') {
-      token.n = token.n.substring(0, token.n.length - 1);
-    }
-  }
-
-  function trim(s) {
-    if (s.trim) {
-      return s.trim();
-    }
-
-    return s.replace(/^\s*|\s*$/g, '');
-  }
-
-  function tagChange(tag, text, index) {
-    if (text.charAt(index) != tag.charAt(0)) {
-      return false;
-    }
-
-    for (var i = 1, l = tag.length; i < l; i++) {
-      if (text.charAt(index + i) != tag.charAt(i)) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  // the tags allowed inside super templates
-  var allowedInSuper = {'_t': true, '\n': true, '$': true, '/': true};
-
-  function buildTree(tokens, kind, stack, customTags) {
-    var instructions = [],
-        opener = null,
-        tail = null,
-        token = null;
-
-    tail = stack[stack.length - 1];
-
-    while (tokens.length > 0) {
-      token = tokens.shift();
-
-      if (tail && tail.tag == '<' && !(token.tag in allowedInSuper)) {
-        throw new Error('Illegal content in < super tag.');
-      }
-
-      if (Hogan.tags[token.tag] <= Hogan.tags['$'] || isOpener(token, customTags)) {
-        stack.push(token);
-        token.nodes = buildTree(tokens, token.tag, stack, customTags);
-      } else if (token.tag == '/') {
-        if (stack.length === 0) {
-          throw new Error('Closing tag without opener: /' + token.n);
-        }
-        opener = stack.pop();
-        if (token.n != opener.n && !isCloser(token.n, opener.n, customTags)) {
-          throw new Error('Nesting error: ' + opener.n + ' vs. ' + token.n);
-        }
-        opener.end = token.i;
-        return instructions;
-      } else if (token.tag == '\n') {
-        token.last = (tokens.length == 0) || (tokens[0].tag == '\n');
-      }
-
-      instructions.push(token);
-    }
-
-    if (stack.length > 0) {
-      throw new Error('missing closing tag: ' + stack.pop().n);
-    }
-
-    return instructions;
-  }
-
-  function isOpener(token, tags) {
-    for (var i = 0, l = tags.length; i < l; i++) {
-      if (tags[i].o == token.n) {
-        token.tag = '#';
-        return true;
-      }
-    }
-  }
-
-  function isCloser(close, open, tags) {
-    for (var i = 0, l = tags.length; i < l; i++) {
-      if (tags[i].c == close && tags[i].o == open) {
-        return true;
-      }
-    }
-  }
-
-  function stringifySubstitutions(obj) {
-    var items = [];
-    for (var key in obj) {
-      items.push('"' + esc(key) + '": function(c,p,t,i) {' + obj[key] + '}');
-    }
-    return "{ " + items.join(",") + " }";
-  }
-
-  function stringifyPartials(codeObj) {
-    var partials = [];
-    for (var key in codeObj.partials) {
-      partials.push('"' + esc(key) + '":{name:"' + esc(codeObj.partials[key].name) + '", ' + stringifyPartials(codeObj.partials[key]) + "}");
-    }
-    return "partials: {" + partials.join(",") + "}, subs: " + stringifySubstitutions(codeObj.subs);
-  }
-
-  Hogan.stringify = function(codeObj, text, options) {
-    return "{code: function (c,p,i) { " + Hogan.wrapMain(codeObj.code) + " }," + stringifyPartials(codeObj) +  "}";
-  }
-
-  var serialNo = 0;
-  Hogan.generate = function(tree, text, options) {
-    serialNo = 0;
-    var context = { code: '', subs: {}, partials: {} };
-    Hogan.walk(tree, context);
-
-    if (options.asString) {
-      return this.stringify(context, text, options);
-    }
-
-    return this.makeTemplate(context, text, options);
-  }
-
-  Hogan.wrapMain = function(code) {
-    return 'var t=this;t.b(i=i||"");' + code + 'return t.fl();';
-  }
-
-  Hogan.template = Hogan.Template;
-
-  Hogan.makeTemplate = function(codeObj, text, options) {
-    var template = this.makePartials(codeObj);
-    template.code = new Function('c', 'p', 'i', this.wrapMain(codeObj.code));
-    return new this.template(template, text, this, options);
-  }
-
-  Hogan.makePartials = function(codeObj) {
-    var key, template = {subs: {}, partials: codeObj.partials, name: codeObj.name};
-    for (key in template.partials) {
-      template.partials[key] = this.makePartials(template.partials[key]);
-    }
-    for (key in codeObj.subs) {
-      template.subs[key] = new Function('c', 'p', 't', 'i', codeObj.subs[key]);
-    }
-    return template;
-  }
-
-  function esc(s) {
-    return s.replace(rSlash, '\\\\')
-            .replace(rQuot, '\\\"')
-            .replace(rNewline, '\\n')
-            .replace(rCr, '\\r')
-            .replace(rLineSep, '\\u2028')
-            .replace(rParagraphSep, '\\u2029');
-  }
-
-  function chooseMethod(s) {
-    return (~s.indexOf('.')) ? 'd' : 'f';
-  }
-
-  function createPartial(node, context) {
-    var prefix = "<" + (context.prefix || "");
-    var sym = prefix + node.n + serialNo++;
-    context.partials[sym] = {name: node.n, partials: {}};
-    context.code += 't.b(t.rp("' +  esc(sym) + '",c,p,"' + (node.indent || '') + '"));';
-    return sym;
-  }
-
-  Hogan.codegen = {
-    '#': function(node, context) {
-      context.code += 'if(t.s(t.' + chooseMethod(node.n) + '("' + esc(node.n) + '",c,p,1),' +
-                      'c,p,0,' + node.i + ',' + node.end + ',"' + node.otag + " " + node.ctag + '")){' +
-                      't.rs(c,p,' + 'function(c,p,t){';
-      Hogan.walk(node.nodes, context);
-      context.code += '});c.pop();}';
-    },
-
-    '^': function(node, context) {
-      context.code += 'if(!t.s(t.' + chooseMethod(node.n) + '("' + esc(node.n) + '",c,p,1),c,p,1,0,0,"")){';
-      Hogan.walk(node.nodes, context);
-      context.code += '};';
-    },
-
-    '>': createPartial,
-    '<': function(node, context) {
-      var ctx = {partials: {}, code: '', subs: {}, inPartial: true};
-      Hogan.walk(node.nodes, ctx);
-      var template = context.partials[createPartial(node, context)];
-      template.subs = ctx.subs;
-      template.partials = ctx.partials;
-    },
-
-    '$': function(node, context) {
-      var ctx = {subs: {}, code: '', partials: context.partials, prefix: node.n};
-      Hogan.walk(node.nodes, ctx);
-      context.subs[node.n] = ctx.code;
-      if (!context.inPartial) {
-        context.code += 't.sub("' + esc(node.n) + '",c,p,i);';
-      }
-    },
-
-    '\n': function(node, context) {
-      context.code += write('"\\n"' + (node.last ? '' : ' + i'));
-    },
-
-    '_v': function(node, context) {
-      context.code += 't.b(t.v(t.' + chooseMethod(node.n) + '("' + esc(node.n) + '",c,p,0)));';
-    },
-
-    '_t': function(node, context) {
-      context.code += write('"' + esc(node.text) + '"');
-    },
-
-    '{': tripleStache,
-
-    '&': tripleStache
-  }
-
-  function tripleStache(node, context) {
-    context.code += 't.b(t.t(t.' + chooseMethod(node.n) + '("' + esc(node.n) + '",c,p,0)));';
-  }
-
-  function write(s) {
-    return 't.b(' + s + ');';
-  }
-
-  Hogan.walk = function(nodelist, context) {
-    var func;
-    for (var i = 0, l = nodelist.length; i < l; i++) {
-      func = Hogan.codegen[nodelist[i].tag];
-      func && func(nodelist[i], context);
-    }
-    return context;
-  }
-
-  Hogan.parse = function(tokens, text, options) {
-    options = options || {};
-    return buildTree(tokens, '', [], options.sectionTags || []);
-  }
-
-  Hogan.cache = {};
-
-  Hogan.cacheKey = function(text, options) {
-    return [text, !!options.asString, !!options.disableLambda, options.delimiters, !!options.modelGet].join('||');
-  }
-
-  Hogan.compile = function(text, options) {
-    options = options || {};
-    var key = Hogan.cacheKey(text, options);
-    var template = this.cache[key];
-
-    if (template) {
-      var partials = template.partials;
-      for (var name in partials) {
-        delete partials[name].instance;
-      }
-      return template;
-    }
-
-    template = this.generate(this.parse(this.scan(text, options.delimiters), text, options), text, options);
-    return this.cache[key] = template;
-  }
-})(typeof exports !== 'undefined' ? exports : Hogan);
-
-
-var Mustache = (function (Hogan) {
-
-  // Mustache.js has non-spec partial context behavior
-  function mustachePartial(name, context, partials, indent) {
-    var partialScope = this.f(name, context, partials, 0);
-    var cx = context;
-    if (partialScope) {
-      cx = cx.concat(partialScope);
-    }
-
-    return Hogan.Template.prototype.rp.call(this, name, cx, partials, indent);
-  }
-
-  var HoganTemplateWrapper = function(renderFunc, text, compiler){
-    this.rp = mustachePartial;
-    Hogan.Template.call(this, renderFunc, text, compiler);
-  };
-  HoganTemplateWrapper.prototype = Hogan.Template.prototype;
-
-  // Add a wrapper for Hogan's generate method. Mustache and Hogan keep
-  // separate caches, and Mustache returns wrapped templates.
-  var wrapper;
-  var HoganWrapper = function(){
-    this.cache = {};
-    this.generate = function(code, text, options) {
-      return new HoganTemplateWrapper(new Function('c', 'p', 'i', code), text, wrapper);
-    }
-  };
-  HoganWrapper.prototype = Hogan;
-  wrapper = new HoganWrapper();
-
-  return {
-    to_html: function(text, data, partials, sendFun) {
-      var template = wrapper.compile(text);
-      var result = template.render(data, partials);
-      if (!sendFun) {
-        return result;
-      }
-
-      sendFun(result);
-    }
-  }
-
-})(Hogan);

docs/src/less/components/buttons.less

@@ -21,10 +21,11 @@ nav {
 }
 
 // Tabs
-.btn-bar {
+.btn__bar {
 	position: relative;
 	margin: 0 auto @padding-base;
 	max-width: @example-width-video;
+	white-space: nowrap;
 
 	&::before {
 		content: "";
@@ -54,18 +55,30 @@ nav {
 		& + li .btn {
 			margin-left: -1px;
 		}
+
+		&.active .btn {
+			&:extend(.btn--primary);
+			box-shadow: inset 0 1px 1px rgba(0,0,0, .2);
+			position: relative;
+			z-index: 1;
+
+			.icon {
+				color: inherit;
+			}
+		}
+		&.active + li .btn:hover {
+			z-index: 0;
+		}
 	}
 	.btn {
+		position: relative;
 		display: block;
 		border-radius: 0;
-	}
-	.active {
-		&:extend(.btn-primary);
-	}
-	.btn.active {
-		box-shadow: inset 0 1px 1px rgba(0,0,0, .2);
-		position: relative;
-		z-index: 1;
+
+		&:hover,
+		&:focus {
+			z-index: 1;
+		}
 	}
 
 	@media (min-width: 560px) {
@@ -73,9 +86,9 @@ nav {
 	}
 }
 
-// Shared 
+// Shared
 .btn,
-.btn-count {
+.btn__count {
 	display: inline-block;
 	vertical-align: middle;
 	border-radius: @border-radius-base;
@@ -83,47 +96,61 @@ nav {
 	user-select: none;
 }
 
-// Buttons 
+// Buttons
 .btn {
-	padding: (@padding-base / 2) @padding-base;
-	background: @body-background;
+	padding: (@padding-base / 2) ((@padding-base / 2) + 2);
+	background: linear-gradient(lighten(@body-background, 2%), darken(@body-background, 3%));
 	border: 1px solid @gray-light;
-	box-shadow: inset 0 1px 0 #fff, 0 1px 1px rgba(0,0,0, .05);
+	box-shadow: 0 1px 1px rgba(0,0,0, .05);
 	text-shadow: 0 1px 1px #fff;
 	color: @gray;
+	transition: background .1s ease, color .1s ease;
+	.font-size(@font-size-small);
 
 	&:hover,
 	&:focus {
-		background-color: #fff;
-		border-color: darken(@gray-light, 5%);
-		color: @link-color;
+		border-color: darken(@gray-light, 8%);
+		color: @gray;
 		outline: 0;
 	}
 }
-.btn-primary {
-	background-image: linear-gradient(@link-color, darken(@link-color, 3%));
+
+// Sizes
+.btn--large {
+	padding: (@padding-base / 2) @padding-base;
+	.font-size();
+}
+
+// Styles
+.btn--primary {
+	background-image: linear-gradient(@link-color, darken(@link-color, 5%));
 	background-color: @link-color;
 	border-color: darken(@link-color, 10%);
 	box-shadow: 0 1px 1px rgba(0,0,0, .15);
 	text-shadow: 0 1px 1px rgba(0,0,0, .1);
 	color: #fff;
-	
+
 	&:hover,
 	&:focus {
 		color: #fff;
 		border-color: darken(@link-color, 20%);
 	}
 }
-.btn-small {
-	padding-top: ceil(@padding-base / 3);
-	padding-bottom: ceil(@padding-base / 3);
+.btn--youtube .icon {
+	color: @color-youtube;
+}
+.btn--vimeo .icon {
+	color: @color-vimeo;
+}
+.btn--twitter .icon {
+	color: @color-twitter;
 }
 
 // Count bubble
-.btn-count {
+.btn__count {
 	position: relative;
-	margin-left: 6px;
-	padding: ((@padding-base / 2) - 1px);
+	margin-left: (@padding-base / 2);
+	padding: (@padding-base / 2) (@padding-base * .75);
 	background: #fff;
 	border: 1px solid @gray-light;
 
@@ -142,4 +169,4 @@ nav {
 		border-width: 1px 0 0 1px;
 		transform: rotate(-45deg) translate(-50%, -50%);
 	}
-}
+}

docs/src/less/components/examples.less

@@ -2,54 +2,37 @@
 // Examples
 // ==========================================================================
 
-// Example players
-.example-audio .player,
-.example-video .player {
+section {
     margin: 0 auto @padding-base;
+    max-width: @example-width-video;
+}
 
-    &-controls {
+video,
+.plyr__video-embed {
+    border-radius: @border-radius-base;
+    max-width: 100%;
+    vertical-align: middle;
+}
+.plyr__video-embed {
+    -webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAA5JREFUeNpiYGBgAAgwAAAEAAGbA+oJAAAAAElFTkSuQmCC);
+}
+
+// Example players
+.plyr {
+    margin: 0 auto;
+
+    &__controls {
         border-radius: 0 0 @border-radius-base @border-radius-base;
     }
-}
-.example-audio .player {
-    max-width: @example-width-audio;
-
-    &-controls {
-        border-radius: @border-radius-base;
-    }
-    &-progress {
-        border-radius: @border-radius-base @border-radius-base 0 0;
-        overflow: hidden;
-    }
-}
-// Base styles
-.example-video .player {
-    max-width: @example-width-video;
-
     video,
-    iframe {
-        border-radius: @border-radius-base;
-    }
-    iframe {
-        -webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAA5JREFUeNpiYGBgAAgwAAAEAAGbA+oJAAAAAElFTkSuQmCC);
-    }
-}
-
-// Style full supported player
-.example-video .player-video,
-.example-video .player-youtube {
-    video,
-    iframe {
+    .plyr__video-embed {
         border-radius: @border-radius-base @border-radius-base 0 0;
     }
-    iframe {
-        -webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAA5JREFUeNpiYGBgAAgwAAAEAAGbA+oJAAAAAElFTkSuQmCC);
-    }
-    &-fullscreen,
-    &.fullscreen-active {
+    &--fullscreen,
+    &--fullscreen-active {
         max-width: none;
 
-        .player-controls,
+        .plyr-controls,
         video,
         iframe {
             border-radius: 0;
@@ -58,4 +41,37 @@
             -webkit-mask-image: none;
         }
     }
-}
+}
+.plyr--audio {
+    max-width: @example-width-audio;
+
+    .plyr__controls {
+        border-radius: @border-radius-base;
+    }
+    .plyr__progress {
+        border-radius: @border-radius-base @border-radius-base 0 0;
+
+        progress,
+        [type='range'] {
+            border-radius: @border-radius-base @border-radius-base 0 0;
+            overflow: hidden;
+        }
+    }
+}
+
+// Style full supported player
+.plyr__cite {
+    display: none;
+    margin-top: @padding-base;
+
+    .icon {
+        margin-right: (@padding-base / 4);
+    }
+}
+
+.plyr--video ~ ul .plyr__cite--video,
+.plyr--audio ~ ul .plyr__cite--audio,
+.plyr--youtube ~ ul .plyr__cite--youtube,
+.plyr--vimeo ~ ul .plyr__cite--vimeo {
+    display: block;
+}

docs/src/less/components/icons.less

@@ -0,0 +1,26 @@
+// ==========================================================================
+// Icons
+// ==========================================================================
+
+// Base size icon styles
+.icon {
+	fill: currentColor;
+	width: @icon-size;
+	height: @icon-size;
+	vertical-align: -3px;
+}
+
+// Within elements
+a svg,
+button svg,
+label svg {
+	pointer-events: none;
+}
+a .icon,
+.btn .icon {
+	margin-right: (@padding-base / 2);
+}
+.btn:not(.btn-large) .icon {
+	width: (@icon-size - 2);
+	height: (@icon-size - 2);
+}

docs/src/less/components/panels.less

@@ -1,13 +0,0 @@
-// ==========================================================================
-// Panels
-// ==========================================================================
-
-// Panels
-.panel {
-    display: none;
-
-    &.active {
-        display: block;
-        animation: fade-in .3s ease;
-    }
-}

docs/src/less/components/type.less

@@ -12,7 +12,7 @@ h2 {
     .font-smoothing();
 }
 h1 {
-    .font-size(64);
+    .font-size(@font-size-h1);
     color: #3498DB;
 }
 
@@ -24,19 +24,28 @@ small {
 small {
     display: block;
     padding: 0 (@padding-base / 2);
-    .font-size(14);
+    .font-size(@font-size-small);
+}
+
+// Lists
+ul,
+li {
+    list-style: none;
+    margin: 0;
+    padding: 0;
 }
 
 // Links
 a {
     text-decoration: none;
     color: @link-color;
-    border-bottom: 1px solid currentColor;
-    transition: background .3s ease, color .3s ease;
+    border-bottom: 1px dotted currentColor;
+    transition: background .3s ease, color .3s ease, border .3s ease;
 
     &:hover,
     &:focus {
         color: @gray-dark;
+        border-bottom-color: rgba(0,0,0,0);
     }
     &:focus {
         .tab-focus();
@@ -44,4 +53,11 @@ a {
     &.logo {
         border: 0;
     }
-}
+}
+
+.color--vimeo {
+    color: @color-vimeo;
+}
+.color--youtube {
+    color: @color-youtube;
+}

docs/src/less/docs.less

@@ -14,21 +14,13 @@
 // Animation
 @import "lib/animation.less";
 
-// Base layout
-@import "components/base.less";
-
 // Type
 @import "lib/fontface.less";
 @import "components/type.less";
 
-// Buttons
+// Components
+@import "components/base.less";
+@import "components/icons.less";
 @import "components/buttons.less";
-
-// Panels
-@import "components/panels.less";
-
-// Error
 @import "components/error.less";
-
-// Examples
-@import "components/examples.less";
+@import "components/examples.less";

docs/src/less/variables.less

@@ -10,14 +10,27 @@
 @gray-lighter:              #dbe3e8;
 @off-white:                 #f2f5f7;
 
+// Brands
+@color-twitter:             #4BAAF4;
+@color-youtube:             #cc181e;
+@color-vimeo:               #19b7ed;
+
 // Base
 @body-background: 			@off-white;
 
+// Type
+@font-size-base:            16;
+@font-size-small:           14;
+@font-size-h1:              64;
+
 // Elements
 @link-color:                @blue;
 @padding-base:              20px;
 @arrow-size:                8px;
 
+// Icons
+@icon-size: 				18px;
+
 // Breakpoints
 @screen-sm:                 480px;
 @screen-md:                 768px;
@@ -27,4 +40,4 @@
 
 // Examples
 @example-width-audio: 		520px;
-@example-width-video: 		1200px;
+@example-width-video: 		1200px;

docs/src/sprite/icon-github.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8,0.2c-4.4,0-8,3.6-8,8c0,3.5,2.3,6.5,5.5,7.6
+	C5.9,15.9,6,15.6,6,15.4c0-0.2,0-0.7,0-1.4C3.8,14.5,3.3,13,3.3,13c-0.4-0.9-0.9-1.2-0.9-1.2c-0.7-0.5,0.1-0.5,0.1-0.5
+	c0.8,0.1,1.2,0.8,1.2,0.8C4.4,13.4,5.6,13,6,12.8c0.1-0.5,0.3-0.9,0.5-1.1c-1.8-0.2-3.6-0.9-3.6-4c0-0.9,0.3-1.6,0.8-2.1
+	c-0.1-0.2-0.4-1,0.1-2.1c0,0,0.7-0.2,2.2,0.8c0.6-0.2,1.3-0.3,2-0.3c0.7,0,1.4,0.1,2,0.3c1.5-1,2.2-0.8,2.2-0.8
+	c0.4,1.1,0.2,1.9,0.1,2.1c0.5,0.6,0.8,1.3,0.8,2.1c0,3.1-1.9,3.7-3.7,3.9C9.7,12,10,12.5,10,13.2c0,1.1,0,1.9,0,2.2
+	c0,0.2,0.1,0.5,0.6,0.4c3.2-1.1,5.5-4.1,5.5-7.6C16,3.8,12.4,0.2,8,0.2z"/>
+</svg>

docs/src/sprite/icon-twitter.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+	 <title>Twitter</title>
+<path d="M16,3c-0.6,0.3-1.2,0.4-1.9,0.5c0.7-0.4,1.2-1,1.4-1.8c-0.6,0.4-1.3,0.6-2.1,0.8c-0.6-0.6-1.5-1-2.4-1
+	C9.3,1.5,7.8,3,7.8,4.8c0,0.3,0,0.5,0.1,0.7C5.2,5.4,2.7,4.1,1.1,2.1c-0.3,0.5-0.4,1-0.4,1.7c0,1.1,0.6,2.1,1.5,2.7
+	c-0.5,0-1-0.2-1.5-0.4c0,0,0,0,0,0c0,1.6,1.1,2.9,2.6,3.2C3,9.4,2.7,9.4,2.4,9.4c-0.2,0-0.4,0-0.6-0.1c0.4,1.3,1.6,2.3,3.1,2.3
+	c-1.1,0.9-2.5,1.4-4.1,1.4c-0.3,0-0.5,0-0.8,0c1.5,0.9,3.2,1.5,5,1.5c6,0,9.3-5,9.3-9.3c0-0.1,0-0.3,0-0.4C15,4.3,15.6,3.7,16,3z"/>
+</svg>

docs/src/sprite/icon-vimeo.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path d="M16,4.3c-0.1,1.6-1.2,3.7-3.3,6.4c-2.2,2.8-4,4.2-5.5,4.2c-0.9,0-1.7-0.9-2.4-2.6C4,9.9,3.4,5,2,5
+	C1.9,5,1.5,5.3,0.8,5.8L0,4.8c0.8-0.7,3.5-3.4,4.7-3.5C5.9,1.2,6.7,2,7,3.8c0.3,2,0.8,6.1,1.8,6.1c0.9,0,2.5-3.4,2.6-4
+	c0.1-0.9-0.3-1.9-2.3-1.1c0.8-2.6,2.3-3.8,4.5-3.8C15.3,1.1,16.1,2.2,16,4.3z"/>
+</svg>

docs/src/sprite/icon-youtube.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path d="M15.8,4.8c-0.2-1.3-0.8-2.2-2.2-2.4C11.4,2,8,2,8,2S4.6,2,2.4,2.4C1,2.6,0.3,3.5,0.2,4.8C0,6.1,0,8,0,8
+	s0,1.9,0.2,3.2c0.2,1.3,0.8,2.2,2.2,2.4C4.6,14,8,14,8,14s3.4,0,5.6-0.4c1.4-0.3,2-1.1,2.2-2.4C16,9.9,16,8,16,8S16,6.1,15.8,4.8z
+	 M6,11V5l5,3L6,11z"/>
+</svg>

docs/src/templates/controls.html

@@ -1,66 +0,0 @@
-<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>
-        <progress class="player-progress-buffer" max="100" value="0">
-            <span>0</span>% buffered
-        </progress>
-    </div>
-    <span class="player-controls-left">
-        <button type="button" data-player="restart">
-            <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 {seektime} secs</span>
-        </button>
-        <button type="button" data-player="play">
-            <svg><use xlink:href="#icon-play"></use></svg>
-            <span class="sr-only">Play</span>
-        </button>
-        <button type="button" data-player="pause">
-            <svg><use xlink:href="#icon-pause"></use></svg>
-            <span class="sr-only">Pause</span>
-        </button>
-        <button type="button" data-player="fast-forward">
-            <svg><use xlink:href="#icon-fast-forward"></use></svg>
-            <span class="sr-only">Forward {seektime} secs</span>
-        </button>
-        <span class="player-time">
-            <span class="sr-only">Current time</span>
-            <span class="player-current-time">00:00</span>
-        </span>
-        <span class="player-time">
-            <span class="sr-only">Duration</span>
-            <span class="player-duration">00:00</span>
-        </span>
-    </span>
-    <span class="player-controls-right">
-        <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-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" 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 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-exit-fullscreen"></use></svg>
-            <svg><use xlink:href="#icon-enter-fullscreen"></use></svg>
-            <span class="sr-only">Toggle Fullscreen</span>
-        </button>
-    </span>
-</div>

gulpfile.js

@@ -17,7 +17,6 @@ var fs          = require("fs"),
     prefix      = require("gulp-autoprefixer"),
     svgstore    = require("gulp-svgstore"),
     svgmin      = require("gulp-svgmin"),
-    hogan       = require("gulp-hogan-compile"),
     rename      = require("gulp-rename"),
     s3          = require("gulp-s3"),
     gzip        = require("gulp-gzip"),
@@ -43,7 +42,7 @@ paths = {
         src: {
             less:       path.join(root, "docs/src/less/**/*"),
             js:         path.join(root, "docs/src/js/**/*"),
-            templates:  path.join(root, "docs/src/templates/*.html")
+            sprite:     path.join(root, "docs/src/sprite/**/*")
         },
         // Output paths
         output:         path.join(root, "docs/dist/"),
@@ -54,10 +53,11 @@ paths = {
 },
 
 // Task arrays
-tasks = {    
+tasks = {
     less:   [],
     sass:   [],
-    js:     []
+    js:     [],
+    sprite: []
 },
 
 // Fetch bundles from JSON
@@ -66,7 +66,12 @@ package = loadJSON(path.join(root, "package.json"));
 
 // Load json
 function loadJSON(path) {
-    return JSON.parse(fs.readFileSync(path));
+    try {
+        return JSON.parse(fs.readFileSync(path));
+    }
+    catch(err) {
+        return {};
+    }
 }
 
 var build = {
@@ -88,7 +93,7 @@ var build = {
     },
     less: function(files, bundle) {
         for (var key in files) {
-            (function (key) {       
+            (function (key) {
                 var name = "less-" + key;
                 tasks.less.push(name);
 
@@ -107,7 +112,7 @@ var build = {
     },
     sass: function(files, bundle) {
         for (var key in files) {
-            (function (key) {       
+            (function (key) {
                 var name = "sass-" + key;
                 tasks.sass.push(name);
 
@@ -124,32 +129,22 @@ var build = {
             })(key);
         }
     },
-    sprite: function() {
+    sprite: function(bundle) {
+        var name = "sprite-" + bundle;
+        tasks.sprite.push(name);
+
         // Process Icons
-        gulp.task("sprite", function () {
+        gulp.task(name, function () {
             return gulp
-                .src(paths.plyr.src.sprite)
+                .src(paths[bundle].src.sprite)
                 .pipe(svgmin({
                     plugins: [{
                         removeDesc: true
                     }]
                 }))
                 .pipe(svgstore())
-                .pipe(gulp.dest(paths.plyr.output));
-        });
-    },
-    templates: function() {
-        // Build templates
-        gulp.task("templates", function () {
-            return gulp
-                .src(paths.docs.src.templates)
-                .pipe(hogan("templates.js", {
-                    wrapper: false,
-                    templateName: function (file) {
-                        return path.basename(file.relative.replace(/\\/g, "-"), path.extname(file.relative));
-                    }
-                }))
-                .pipe(gulp.dest(paths.docs.output));
+                .pipe(rename({ basename: (bundle == "plyr" ? "sprite" : bundle) }))
+                .pipe(gulp.dest(paths[bundle].output));
         });
     }
 };
@@ -158,21 +153,16 @@ var build = {
 build.js(bundles.plyr.js, "plyr");
 build.less(bundles.plyr.less, "plyr");
 build.sass(bundles.plyr.sass, "plyr");
-build.sprite();
+build.sprite("plyr");
 
 // Docs files
-build.templates();
 build.less(bundles.docs.less, "docs");
 build.js(bundles.docs.js, "docs");
+build.sprite("docs");
 
-// Default gulp task
-gulp.task("default", function(){
-    run("templates", tasks.js, tasks.less, "sprite");
-});
-
-// Build all JS (inc. templates)
+// Build all JS
 gulp.task("js", function(){
-    run("templates", tasks.js);
+    run(tasks.js);
 });
 
 // Build SASS (for testing, default is LESS)
@@ -185,12 +175,17 @@ gulp.task("watch", function () {
     // Plyr core
     gulp.watch(paths.plyr.src.js, tasks.js);
     gulp.watch(paths.plyr.src.less, tasks.less);
-    gulp.watch(paths.plyr.src.sprite, ["sprite"]);
+    gulp.watch(paths.plyr.src.sprite, tasks.sprite);
 
     // Docs
     gulp.watch(paths.docs.src.js, tasks.js);
     gulp.watch(paths.docs.src.less, tasks.less);
-    gulp.watch(paths.docs.src.templates, ["js"]);
+    gulp.watch(paths.docs.src.sprite, tasks.sprite);
+});
+
+// Default gulp task
+gulp.task("default", function(){
+    run(tasks.js, tasks.less, tasks.sprite, "watch");
 });
 
 // Publish a version to CDN and docs
@@ -203,7 +198,7 @@ maxAge  = 31536000, // seconds 1 year
 options = {
     cdn: {
         headers: {
-            "Cache-Control": "max-age=" + maxAge + ", no-transform, public",
+            "Cache-Control": "max-age=" + maxAge,
             "Vary": "Accept-Encoding"
         },
         gzippedOnly: true
@@ -215,14 +210,19 @@ options = {
         },
         gzippedOnly: true
     }
-},
-cdnpath = new RegExp(aws.cdn.bucket + "\/(\\d+\\.)?(\\d+\\.)?(\\*|\\d+)","gi");
+};
+
+// If aws is setup
+if("cdn" in aws) {
+    var cdnpath = new RegExp(aws.cdn.bucket + "\/(\\d+\\.)?(\\d+\\.)?(\\*|\\d+)","gi"),
+    localpath   = new RegExp("(\.\.\/)?dist", "gi");
+}
 
 // Publish version to CDN bucket
 gulp.task("cdn", function () {
     console.log("Uploading " + version + " to " + aws.cdn.bucket);
 
-    // Upload to CDN 
+    // Upload to CDN
     gulp.src(paths.upload)
         .pipe(size({
             showFiles: true,
@@ -244,15 +244,16 @@ gulp.task("docs", function () {
         .pipe(replace(cdnpath, aws.cdn.bucket + "/" + version))
         .pipe(gulp.dest(root));
 
-    // Replace versioned files in *.html
+    // Replace local file paths with remote paths in docs
+    // e.g. "../dist/plyr.js" to "https://cdn.plyr.io/x.x.x/plyr.js"
     gulp.src([paths.docs.root + "*.html"])
-        .pipe(replace(cdnpath, aws.cdn.bucket + "/" + version))
-        .pipe(gulp.dest(paths.docs.root))
+        .pipe(replace(localpath, "https://" + aws.cdn.bucket + "/" + version))
         .pipe(gzip())
         .pipe(s3(aws.docs, options.docs));
 
-    // Upload error.html to cdn using docs options
+    // Upload error.html to cdn (as well as docs site)
     gulp.src([paths.docs.root + "error.html"])
+        .pipe(replace(localpath, "https://" + aws.cdn.bucket + "/" + version))
         .pipe(gzip())
         .pipe(s3(aws.cdn, options.docs));
 });
@@ -270,7 +271,7 @@ gulp.task("open", function () {
         }));
 });
 
-// Do everything 
+// Do everything
 gulp.task("publish", function () {
-    run("templates", tasks.js, tasks.less, "sprite", "cdn", "docs");
-});
+    run(tasks.js, tasks.less, tasks.sprite, "cdn", "docs");
+});

package.json

@@ -1,29 +1,28 @@
 {
   "name": "plyr",
-  "version": "1.2.3",
+  "version": "1.5.7",
   "description": "A simple HTML5 media player using custom controls",
   "homepage": "http://plyr.io",
   "main": "gulpfile.js",
   "dependencies": {},
   "devDependencies": {
-    "gulp": "^3.8.6",
-    "gulp-autoprefixer": "^0.0.8",
+    "gulp": "^3.9.0",
+    "gulp-autoprefixer": "^3.1.0",
     "gulp-concat": "^2.3.3",
     "gulp-gzip": "^1.0.0",
-    "gulp-hogan-compile": "^0.4.1",
-    "gulp-less": "^1.3.1",
-    "gulp-minify-css": "^0.3.6",
-    "gulp-open": "^0.3.2",
+    "gulp-less": "^3.0.5",
+    "gulp-minify-css": "^1.2.1",
+    "gulp-open": "^1.0.0",
     "gulp-rename": "^1.2.0",
     "gulp-replace": "^0.5.3",
     "gulp-s3": "^0.3.0",
-    "gulp-sass": "^1.3.3",
-    "gulp-size": "^1.2.1",
+    "gulp-sass": "^2.1.0",
+    "gulp-size": "^2.0.0",
     "gulp-svgmin": "^1.0.0",
     "gulp-svgstore": "^5.0.0",
-    "gulp-uglify": "^0.3.1",
-    "gulp-util": "^2.2.20",
-    "run-sequence": "^0.3.6"
+    "gulp-uglify": "^1.5.1",
+    "gulp-util": "^3.0.7",
+    "run-sequence": "^1.1.5"
   },
   "scripts": {
     "preinstall": "npm install -g gulp"

readme.md

@@ -1,45 +1,46 @@
 # Plyr
-A simple, accessible HTML5 media player. 
+A simple, accessible and customizable HTML5, YouTube and Vimeo media player.
 
 [Checkout the demo](http://plyr.io)
 
-[![Image of Plyr](https://cdn.plyr.io/static/plyr.jpg)](http://plyr.io)
+[![Image of Plyr](https://cdn.plyr.io/static/plyr-v1.5.jpg)](http://plyr.io)
 
 ## Why?
-We wanted a lightweight, accessible and customisable media player that just supports [*modern*](#browser-support) browsers. Sure, there are many other players out there but we wanted to keep things simple, using the right elements for the job. 
+We wanted a lightweight, accessible and customizable media player that supports [*modern*](#browser-support) browsers. Sure, there are many other players out there but we wanted to keep things simple, using the right elements for the job.
 
 ## Features
-- **Accessible** - full support for captions and screen readers.
-- **Lightweight** - just 7.5KB minified and gzipped.
-- **[Customisable](#html)** - make the player look how you want with the markup you want.
-- **Semantic** - uses the *right* elements. `<input type="range">` for volume and `<progress>` for progress and well, `<button>`s for buttons. There's no `<span>` or `<a href="#">` button hacks.
-- **Responsive** - as you'd expect these days.
-- **Audio & Video** - support for both formats.
-- **[Embedded Video](#embeds)** - support for YouTube (Vimeo soon).
-- **[API](#api)** - toggle playback, volume, seeking, and more.
-- **[Fullscreen](#fullscreen)** - supports native fullscreen with fallback to "full window" modes.
-- **No dependencies** - written in vanilla JavaScript, no jQuery required. 
+- **Accessible** - full support for VTT captions and screen readers
+- **Lightweight** - under 10KB minified and gzipped
+- **[Customisable](#html)** - make the player look how you want with the markup you want
+- **Semantic** - uses the *right* elements. `<input type="range">` for volume and `<progress>` for progress and well, `<button>`s for buttons. There's no `<span>` or `<a href="#">` button hacks
+- **Responsive** - as you'd expect these days
+- **HTML Video & Audio** - support for both formats
+- **[Embedded Video](#embeds)** - support for YouTube and Vimeo video playback
+- **[API](#api)** - toggle playback, volume, seeking, and more
+- **[Universal events](#events)** - no messing around with Vimeo and YouTube APIs, all events are universal across formats
+- **[Fullscreen](#fullscreen)** - supports native fullscreen with fallback to "full window" modes
+- **i18n support** - support for internationalization of controls
+- **No dependencies** - written in "vanilla" JavaScript, no jQuery required
 
-Oh and yes, it works with Bootstrap. 
+Oh and yes, it works with Bootstrap.
 
 ## Changelog
-Check out [the changelog](changelog.md)
+Check out the [changelog](changelog.md) to see what's been new with Plyr.
 
-## Planned development
-- Playlists
-- ~~YouTube~~ and Vimeo support
+## Planned Development
 - Playback speed
+- Playlists
 - Multiple language captions (with selection)
 - Audio captions
 ... and whatever else has been raised in [issues](https://github.com/Selz/plyr/issues)
 
-If you have any cool ideas or features, please let me know by [creating an issue](https://github.com/Selz/plyr/issues/new) or of course, forking and sending a pull request.
+If you have any cool ideas or features, please let me know by [creating an issue](https://github.com/Selz/plyr/issues/new) or, of course, forking and sending a pull request.
 
 ## Implementation
 
-Check `docs/index.html` and `docs/dist/docs.js` for an example setup. 
+Check `docs/index.html` and `docs/dist/docs.js` for an example setup.
 
-**Heads up**, the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.2.3/plyr.js` to `https://cdn.plyr.io/1.2.3/plyr.js`
+**Heads up:** the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.5.7/plyr.js` to `https://cdn.plyr.io/1.5.7/plyr.js`
 
 ### Bower
 If bower is your thang, you can grab Plyr using:
@@ -55,23 +56,25 @@ ember addon:install ember-cli-plyr
 ```
 More info is on [npm](https://www.npmjs.com/package/ember-cli-plyr) and [GitHub](https://github.com/louisrudner/ember-cli-plyr)
 
-### CDN 
+### CDN
 If you want to use our CDN, you can use the following:
 
 ```html
-<link rel="stylesheet" href="https://cdn.plyr.io/1.2.3/plyr.css">
-<script src="https://cdn.plyr.io/1.2.3/plyr.js"></script>
+<link rel="stylesheet" href="https://cdn.plyr.io/1.5.7/plyr.css">
+<script src="https://cdn.plyr.io/1.5.7/plyr.js"></script>
 ```
 
-You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.2.3/sprite.svg`.
+You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.5.7/sprite.svg`.
 
-### CSS
-If you want to use the default css, add the `plyr.css` file from /dist into your head, or even better use `plyr.less` or `plyr.sass` file included in `/src` in your build to save a request. 
+### CSS & Styling
+If you want to use the default css, add the `plyr.css` file from `/dist` into your head, or even better use `plyr.less` or `plyr.sass` file included in `/src` in your build to save a request.
 
 ```html
 <link rel="stylesheet" href="dist/plyr.css">
 ```
 
+The default setup uses the BEM methodology with `plyr` as the block, e.g. `.plyr__controls`. You can change the class hooks in the options. Check out the source for more on this.
+
 ### SVG
 The SVG sprite for the controls icons is loaded in by AJAX to help with performance. This is best added before the closing `</body>`, before any other scripts.
 
@@ -80,79 +83,115 @@ The SVG sprite for the controls icons is loaded in by AJAX to help with performa
 (function(d, p){
 	var a = new XMLHttpRequest(),
 		b = d.body;
-	a.open("GET", p, true);
+	a.open('GET', p, true);
 	a.send();
-	a.onload = function(){
-		var c = d.createElement("div");
-		c.style.display = "none";
+	a.onload = function() {
+		var c = d.createElement('div');
+		c.setAttribute('hidden', '');
 		c.innerHTML = a.responseText;
 		b.insertBefore(c, b.childNodes[0]);
-	}
-})(document, "dist/sprite.svg");
+	};
+})(document, 'path/to/sprite.svg');
 </script>
 ```
+
+If you're using the `<base>` tag on your site, you may need to use something like this:
+[https://gist.github.com/leonderijke/c5cf7c5b2e424c0061d2](svgfixer.js)
+
 More info on SVG sprites here:
-[http://css-tricks.com/svg-sprites-use-better-icon-fonts/](http://css-tricks.com/svg-sprites-use-better-icon-fonts/) 
-and the AJAX technique here: 
+[http://css-tricks.com/svg-sprites-use-better-icon-fonts/](http://css-tricks.com/svg-sprites-use-better-icon-fonts/)
+and the AJAX technique here:
 [http://css-tricks.com/ajaxing-svg-sprite/](http://css-tricks.com/ajaxing-svg-sprite/)
 
 ### HTML
 The only extra markup that's needed to use plyr is a `<div>` wrapper. Replace the source, poster and captions with urls for your media.
 ```html
-<div class="player">
-	<video poster="https://cdn.selz.com/plyr/1.0/poster.jpg" controls crossorigin>
+<div class="plyr">
+	<video poster="/path/to/poster.jpg" controls>
 		<!-- Video files -->
-		<source src="https://cdn.selz.com/plyr/1.0/movie.mp4" type="video/mp4">
-		<source src="https://cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
-		
+		<source src="/path/to/video.mp4" type="video/mp4">
+		<source src="/path/to/video.webm" type="video/webm">
+
 		<!-- Text track file -->
-		<track kind="captions" label="English captions" src="https://cdn.selz.com/plyr/1.0/movie_captions_en.vtt" srclang="en" default>
-		
+		<track kind="captions" label="English captions" src="/path/to/captions.vtt" srclang="en" default>
+
 		<!-- Fallback for browsers that don't support the <video> element -->
-		<a href="https://cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
+		<a href="/path/to/movie.mp4">Download</a>
 	</video>
 </div>
 ```
 And the same for `<audio>`
 
 ```html
-<div class="player">
+<div class="plyr">
 	<audio controls>
 		<!-- Audio files -->
-		<source src="https://cdn.selz.com/plyr/1.0/logistics-96-sample.mp3" type="audio/mp3">
-		<source src="https://cdn.selz.com/plyr/1.0/logistics-96-sample.ogg" type="audio/ogg">
-		
+		<source src="/path/to/audio.mp3" type="audio/mp3">
+		<source src="/path/to/audio.ogg" type="audio/ogg">
+
 		<!-- Fallback for browsers that don't support the <audio> element -->
-		<a href="https://cdn.selz.com/plyr/1.0/logistics-96-sample.mp3">Download</a>
+		<a href="/path/to/audio.mp3">Download</a>
 	</audio>
 </div>
-```	
+```
 
-For YouTube, Plyr uses the standard YouTube API markup (an empty `<div>`):
+For YouTube and Vimeo, Plyr uses the standard YouTube API markup (an empty `<div>`):
 
 ```html
-<div class="player">
-	<div data-video-id="L1h9xxCU20g" data-type="youtube"></div>
+<div class="plyr">
+	<div data-video-id="bTqVqk7FSmY" data-type="youtube"></div>
+</div>
+```
+```html
+<div class="plyr">
+	<div data-video-id="143418951" data-type="vimeo"></div>
 </div>
 ```
 
 #### Cross Origin (CORS)
-You'll notice the `crossorigin` attribute on the example `<video>` and `<audio>` elements. This is because the media is loaded from another domain. If your media is hosted on another domain, you may need to add this attribute. 
+You'll notice the `crossorigin` attribute on the example `<video>` and `<audio>` elements. This is because the media is loaded from another domain. If your media is hosted on another domain, you may need to add this attribute.
 
 More info on CORS here:
 [https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS)
 
 ### JavaScript
-Much of the behaviour of the player is configurable when initialising the library. Here's an example of a default setup:
+
+#### Quick setup
+
+Here's an example of a default setup:
 
 ```html
-<script src="dist/plyr.js"></script>
+<script src="https://cdn.plyr.io/1.5.7/plyr.js"></script>
 <script>plyr.setup();</script>
 ```
 
+This will look for all elements with the specified container classname (default is `plyr`) and setup plyr on each element found. You can specify other options, including a different selector hook below. The container classname will be added to the specified element(s) if it is not already present (for the CSS).
+
+You can initialize the player a few other ways:
+
+Passing a [NodeList](https://developer.mozilla.org/en-US/docs/Web/API/NodeList):
+```javascript
+plyr.setup(document.querySelectorAll('.js-plyr'), options);
+```
+
+Passing a [HTMLElement](https://developer.mozilla.org/en/docs/Web/API/HTMLElement):
+```javascript
+plyr.setup(document.querySelector('.js-plyr'), options);
+```
+
+Passing a [string selector](https://developer.mozilla.org/en-US/docs/Web/API/Document/querySelectorAll):
+```javascript
+plyr.setup('.js-plyr', options);
+```
+
+Passing just the options object:
+```javascript
+plyr.setup(options);
+```
+
 #### Options
 
-You can pass the following options to the setup method using `plyr.setup({...})`.
+Options must be passed as an object to the `setup()` method as above.
 
 <table class="table" width="100%">
 <thead>
@@ -168,7 +207,7 @@ You can pass the following options to the setup method using `plyr.setup({...})`
     <td><code>enabled</code></td>
     <td>Boolean</td>
     <td><code>true</code></td>
-    <td>Completely disable Plyr. This would allow you to do a User Agent check or similar to programatically enable or disable Plyr for a certain UA. Example below.</td>
+    <td>Completely disable Plyr. This would allow you to do a User Agent check or similar to programmatically enable or disable Plyr for a certain UA. Example below.</td>
   </tr>
   <tr>
     <td><code>html</code></td>
@@ -182,6 +221,12 @@ You can pass the following options to the setup method using `plyr.setup({...})`
     <td><code>["restart", "rewind", "play", "fast-forward", "current-time", "duration", "mute", "volume", "captions", "fullscreen"]</code></td>
     <td>Toggle which control elements you would like to display when using the default controls html. If you specify a <code>html</code> option, this is redundant. The default value is to display everything.</td>
   </tr>
+  <tr>
+    <td><code>i18n</code></td>
+    <td>Object</td>
+    <td><code><a href="controls.md">See controls.md</a></code></td>
+    <td>Used for internationalization (i18n) of the tooltips/labels within the buttons.</td>
+  </tr>
   <tr>
     <td><code>iconPrefix</code></td>
     <td>String</td>
@@ -214,9 +259,13 @@ You can pass the following options to the setup method using `plyr.setup({...})`
   </tr>
   <tr>
     <td><code>tooltips</code></td>
-    <td>Boolean</td>
-    <td><code>false</code></td>
-    <td>Display control labels as tooltips on :hover &amp; :focus (by default, the labels are screen reader only).</td>
+    <td>Object</td>
+    <td><code>{ controls: false, seek: true }</code></td>
+    <td>
+		<strong>controls</strong>: Display control labels as tooltips on :hover &amp; :focus (by default, the labels are screen reader only).
+		<br><br>
+		<strong>seek</strong>: Display a seek tooltip to indicate on click where the media would seek to.
+	</td>
   </tr>
     <tr>
     <td><code>displayDuration</code></td>
@@ -228,7 +277,13 @@ You can pass the following options to the setup method using `plyr.setup({...})`
     <td><code>selectors</code></td>
     <td>Object</td>
     <td>&mdash;</td>
-    <td>See <code>plyr.js</code> in <code>/src</code> for more info. The only option you might want to change is <code>player</code> which is the hook used for Plyr, the default is <code>.player</code>.</td>
+    <td>See <code>plyr.js</code> in <code>/src</code> for more info. You probably don't need to change any of these.</td>
+  </tr>
+  <tr>
+    <td><code>listeners</code></td>
+    <td>Object</td>
+    <td>&mdash;</td>
+    <td>Allows early binding of event listeners to the controls. See <code>controls</code> above for list of controls and see <code>plyr.js</code> in <code>/src</code> for more info.</td>
   </tr>
   <tr>
     <td><code>classes</code></td>
@@ -246,7 +301,7 @@ You can pass the following options to the setup method using `plyr.setup({...})`
     <td><code>fullscreen</code></td>
     <td>Object</td>
     <td>&mdash;</td>
-    <td>Three properties; <code>enabled</code> which toggles if fullscreen should be enabled (if the browser supports it). The default value is <code>true</code>. A <code>fallback</code> property which will enable a full window view for older browsers. The default value is <code>true</code>. A <code>hideControls</code> property which will hide the controls when fullscreen is active and the video is playing, after 1s. The controls reappear on hover of the progress bar (mouse), focusing a child control or pausing the video (by tap/click of video if `click` is `true`). The default value is <code>true</code>.</td>
+    <td>See <a href="#fullscreen-options">below</a></td>
   </tr>
   <tr>
     <td><code>storage</code></td>
@@ -254,21 +309,71 @@ You can pass the following options to the setup method using `plyr.setup({...})`
     <td>&mdash;</td>
     <td>Two properties; <code>enabled</code> which toggles if local storage should be enabled (if the browser supports it). The default value is `true`. This enables storing user settings, currently it only stores volume but more will be added later. The second property <code>key</code> is the key used for the local storage. The default is <code>plyr_volume</code> until more settings are stored.</td>
   </tr>
-  <tr>
-    <td><code>onSetup</code></td>
-    <td>Function</td>
-    <td>&mdash;</td>
-    <td>This callback function is called on every new plyr instance created. The context (<code>this</code>) is the plyr instance itself.</td>
-  </tr>
  </tbody>
 </table>
 
+#### Fullscreen options
+
+<table class="table" width="100%" id="fullscreen-options">
+<thead>
+  <tr>
+    <th width="20%">Option</th>
+    <th width="15%">Type</th>
+    <th width="15%">Default</th>
+    <th width="50%">Description</th>
+  </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><code>enabled</code></td>
+      <td>Boolean</td>
+      <td><code>true</code></td>
+      <td>Toggles if fullscreen should be enabled (if the browser supports it).</td>
+    </tr>
+    <tr>
+      <td><code>fallback</code></td>
+      <td>Boolean</td>
+      <td><code>true</code></td>
+      <td>Enable a full viewport view for older browsers.</td>
+    </tr>
+    <tr>
+      <td><code>hideControls</code></td>
+      <td>Boolean</td>
+      <td><code>true</code></td>
+      <td>Hide the controls when fullscreen is active and the video is playing, after 1s. The controls reappear on hover of the progress bar (mouse), focusing a child control or pausing the video (by tap/click of video if `click` is `true`).</td>
+    </tr>
+    <tr>
+      <td><code>allowAudio</code></td>
+      <td>Boolean</td>
+      <td><code>false</code></td>
+      <td>Allow audio play to toggle fullscreen. This will be more useful later when posters are supported.</td>
+    </tr>
+  </tbody>
+</table>
+
 ## API
 
-A `plyr` object is added to any element that Plyr is initialised on. You can then control the player by accessing methods in the `plyr` object. For example if you wanted to pause Plyr:
+#### Fetching the plyr instance
+A `plyr` object is added to any element that Plyr is initialized on. You can then control the player by accessing methods in the `plyr` object.
+
+There are two ways to access the instance, firstly you re-query the element container you used for setup (e.g. `.js-plyr`) like so:
 
 ```javascript
-document.querySelectorAll(".player")[0].plyr.pause();
+var player = document.querySelector('.js-plyr');
+```
+
+Or you can use the returned object from your call to the setup method:
+
+```javascript
+var player = plyr.setup('.js-plyr')[0];
+```
+
+This will return an array of plyr instances setup, so you need to specify the index of the instance you want. This is less useful if you are setting up mutliple instances. You can listen for the `setup` [event](#events) documented below which will return each instance one by one, as they are setup (in the `plyr` key of the event object).
+
+Once you have your instance, you can use the API methods below on it. For example to pause it:
+
+```javascript
+player.pause();
 ```
 
 Here's a list of the methods supported:
@@ -280,8 +385,8 @@ Here's a list of the methods supported:
     <th width="15%">Parameters</th>
     <th width="65%">Description</th>
   </tr>
-  </thead>
-  <tbody>
+</thead>
+<tbody>
   <tr>
     <td><code>play()</code></td>
     <td>&mdash;</td>
@@ -349,20 +454,23 @@ Here's a list of the methods supported:
   </tr>
   <tr>
     <td><code>source(...)</code></td>
-    <td>String or Array</td>
+    <td>Array or undefined</td>
     <td>
-      Set the media source.
-      <br><br> 
+      Get/Set the media source.
+      <br><br>
       <strong>string</strong><br>
       <code>.source("/path/to/video.mp4")</code><br>
       This will set the <code>src</code> attribute on the <code>video</code> or <code>audio</code> element.
       <br><br>
       <strong>array</strong><br>
       <code>.source([{ src: "/path/to/video.webm", type: "video/webm", ...more attributes... }, { src: "/path/to/video.mp4", type: "video/mp4", ...more attributes... }])`</code><br>
-      This will inject a child `source` element for every element in the array with the specified attributes. `src` is the only required attribute although adding `type` is recommended as it helps the browser decide which file to download and play. 
+      This will inject a child `source` element for every element in the array with the specified attributes. `src` is the only required attribute although adding `type` is recommended as it helps the browser decide which file to download and play.
       <br><br>
       <strong>YouTube</strong><br>
       Currently this API method only accepts a YouTube ID when used with a YouTube player. I will add URL support soon, along with being able to swap between types (e.g. YouTube to Audio or Video and vice versa.)
+      <br><br>
+      <strong>undefined</strong><br>
+      Returns the current media source url. Works for both native videos and embeds.
     </td>
   </tr>
   <tr>
@@ -383,43 +491,261 @@ Here's a list of the methods supported:
  </tbody>
 </table>
 
-## Events/Callbacks
+#### .source() method
 
-The `plyr` object on the player element also contains a `media` property which is a reference to the `<audio>` or `<video>` element within the player which you can use to listen for events. Here's an example:
+This allows changing the plyr source and type on the fly.
+
+Video example:
 
 ```javascript
-var media = document.querySelectorAll(".player")[0].plyr.media;
-
-media.addEventListener("playing", function() { 
-  console.log("playing");
+player.source({
+  type:       'video',
+  title:      'Example title',
+  sources: [{
+      src:    '/path/to/movie.mp4',
+      type:   'video/mp4'
+  },
+  {
+      src:    '/path/to/movie.webm',
+      type:   'video/webm'
+  }],
+  poster:     '/path/to/poster.jpg',
+  tracks:     [{
+      kind:   'captions',
+      label:  'English',
+      srclang:'en',
+      src:    '/path/to/captions.vtt',
+      default: true
+  }]
+});
+```
+
+Audio example:
+
+```javascript
+player.source({
+  type:       'audio',
+  title:      'Example title',
+  sources: [{
+    src:      '/path/to/audio.mp3',
+    type:     'audio/mp3'
+  },
+  {
+    src:      '/path/to/audio.ogg',
+    type:     'audio/ogg'
+  }]
+});
+```
+
+YouTube example:
+
+```javascript
+player.source({
+  type:       'video',
+  title:      'Example title',
+  sources: [{
+      src:    'bTqVqk7FSmY',
+      type:   'youtube'
+  }]
+});
+```
+
+Vimeo example
+
+```javascript
+player.source({
+  type:       'video',
+  title:      'Example title',
+  sources: [{
+      src:    '143418951',
+      type:   'vimeo'
+  }]
+});
+```
+
+Some more details on the object parameters
+
+<table class="table" width="100%">
+  <thead>
+    <tr>
+      <th width="20%">Key</th>
+      <th width="15%">Type</th>
+      <th width="65%">Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><code>type</code></td>
+      <td>String</td>
+      <td>Options are <code>video</code>, <code>audio</code>, <code>youtube</code> and <code>vimeo</code></td>
+    </tr>
+    <tr>
+      <td><code>title</code></td>
+      <td>String</td>
+      <td>Title of the new media. Used for the aria labelling.</td>
+    </tr>
+    <tr>
+      <td><code>sources</code></td>
+      <td>Array or String</td>
+      <td>This is an array of sources or optionally a string for embedded players (YouTube and Vimeo). `type` is also optional for YouTube and Vimeo when specifying an array. For YouTube and Vimeo media, only the video ID must be passed as the source as shown above. The keys of this object are mapped directly to HTML attributes so more can be added to the object if required.</td>
+    </tr>
+    <tr>
+      <td><code>poster</code></td>
+      <td>String</td>
+      <td>URL for the poster image (video only).</td>
+    </tr>
+    <tr>
+      <td><code>tracks</code></td>
+      <td>Array</td>
+      <td>An array of track objects. Each element in the array is mapped directly to a track element and any keys mapped directly to HTML attributes so as in the example above, it will render as `<track kind="captions" label="English" srclang="en" src="https://cdn.selz.com/plyr/1.0/example_captions_en.vtt" default>`. Booleans are converted to HTML5 value-less attributes.</td>
+    </tr>
+  </tbody>
+</table>
+
+
+## Events
+
+You can listen for events on the element you setup Plyr on. Some events only apply to HTML5 audio and video.
+
+<table class="table" width="100%">
+  <thead>
+    <tr>
+      <th width="20%">Event name</th>
+	  <th width="20%">HTML5 only</th>
+      <th width="60%">Description</th>
+    </tr>
+  </thead>
+  <tbody>
+	<tr>
+		<td><code>canplay</code></td>
+		<td>✔</td>
+		<td>Sent when enough data is available that the media can be played, at least for a couple of frames. This corresponds to the <code>HAVE_ENOUGH_DATA</code> <code>readyState</code>.</td>
+	</tr>
+	<tr>
+		<td><code>canplaythrough</code></td>
+		<td></td>
+		<td>Sent when the ready state changes to <code>CAN_PLAY_THROUGH</code>, indicating that the entire media can be played without interruption, assuming the download rate remains at least at the current level. <strong>Note</strong>: Manually setting the <code>currentTime</code> will eventually fire a <code>canplaythrough</code> event in firefox. Other browsers might not fire this event.</td>
+	</tr>
+	<tr>
+		<td><code>emptied</code></td>
+		<td>✔</td>
+		<td>The media has become empty; for example, this event is sent if the media has already been loaded (or partially loaded), and the <code>load()</code> method is called to reload it.</td>
+	</tr>
+	<tr>
+		<td><code>ended</code></td>
+		<td></td>
+		<td>Sent when playback completes.</td>
+	</tr>
+	<tr>
+		<td><code>error</code></td>
+		<td>✔</td>
+		<td>Sent when an error occurs.&nbsp; The element's <code>error</code> attribute contains more information.</td>
+	</tr>
+	<tr>
+		<td><code>loadeddata/code></td>
+		<td>✔</td>
+		<td>The first frame of the media has finished loading.</td>
+	</tr>
+	<tr>
+		<td><code>loadedmetadata</code></td>
+		<td>✔</td>
+		<td>The media's metadata has finished loading; all attributes now contain as much useful information as they're going to.</td>
+	</tr>
+	<tr>
+		<td><code>loadstart</code></td>
+		<td>✔</td>
+		<td>Sent when loading of the media begins.</td>
+	</tr>
+	<tr>
+		<td><code>pause</code></td>
+		<td></td>
+		<td>Sent when playback is paused.</td>
+	</tr>
+	<tr>
+		<td><code>play</code></td>
+		<td></td>
+		<td>Sent when playback of the media starts after having been paused; that is, when playback is resumed after a prior <code>pause</code> event.</td>
+	</tr>
+	<tr>
+		<td><code>playing</code></td>
+		<td></td>
+		<td>Sent when the media begins to play (either for the first time, after having been paused, or after ending and then restarting).</td>
+	</tr>
+	<tr>
+		<td><code>progress</code></td>
+		<td></td>
+		<td>Sent periodically to inform interested parties of progress downloading the media. Information about the current amount of the media that has been downloaded is available in the media element's <code>buffered</code> attribute.</td>
+	</tr>
+	<tr>
+		<td><code>seeked</code></td>
+		<td>✔</td>
+		<td>Sent when a seek operation completes.</td>
+	</tr>
+	<tr>
+		<td><code>seeking</code></td>
+		<td>✔</td>
+		<td>Sent when a seek operation begins.</td>
+	</tr>
+	<tr>
+		<td><code>stalled</code></td>
+		<td>✔</td>
+		<td>Sent when the user agent is trying to fetch media data, but data is unexpectedly not forthcoming.</td>
+	</tr>
+	<tr>
+		<td><code>timeupdate</code></td>
+		<td></td>
+		<td>The time indicated by the element's <code>currentTime</code> attribute has changed.</td>
+	</tr>
+	<tr>
+		<td><code>volumechange</code></td>
+		<td></td>
+		<td>Sent when the audio volume changes (both when the volume is set and when the <code>muted</code> attribute is changed).</td>
+	</tr>
+	<tr>
+		<td><code>waiting</code></td>
+		<td>✔</td>
+		<td>Sent when the requested operation (such as playback) is delayed pending the completion of another operation (such as a seek).</td>
+	</tr>
+	<tr>
+		<td><code>enterfullscreen</code></td>
+		<td></td>
+		<td>User enters fullscreen (either the proper fullscreen or full-window fallback for older browsers)</td>
+	</tr>
+	<tr>
+		<td><code>exitfullscreen</code></td>
+		<td></td>
+		<td>User exits fullscreen</td>
+	</tr>
+	<tr>
+		<td><code>captionsenabled</code></td>
+		<td></td>
+		<td>Captions toggled on</td>
+	</tr>
+	<tr>
+		<td><code>captionsdisabled</code></td>
+		<td></td>
+		<td>Captions toggled off</td>
+	</tr>
+	</tbody>
+</table>
+
+Details borrowed from: [https://developer.mozilla.org/en-US/docs/Web/Guide/Events/Media_events](https://developer.mozilla.org/en-US/docs/Web/Guide/Events/Media_events)
+
+Here's an example of binding an event listener:
+
+```javascript
+document.querySelector(".js-plyr").addEventListener("playing", function() {
+  /* Magic happens */
 });
 ```
-A complete list of events can be found here:
-[Media Events - W3.org](http://www.w3.org/2010/05/video/mediaevents.html)
 
 ## Embeds
 
-Currently only YouTube is supported. Vimeo will be coming soon. Some HTML5 media events are triggered on the `media` property of the `plyr` object:
-- `play`
-- `pause`
-- `timeupdate`
-- `progress`
-
-Due to the way the YouTube API works, the `timeupdate` and `progress` events are triggered by polling every 200ms so the event may trigger without an actual value change. Buffering progress is `media.buffered` in the `plyr` object. It is a a number between 0 and 1 that specifies the percentage of the video that the player shows as buffered.
-
-```javascript
-document.querySelector(".player").plyr.media.addEventListener("play", function() { 
-	console.log("play");
-});
-``` 
-
-The `.source()` API method can also be used but the video id must be passed as the argument. 
-
-Currently caption control is not supported but I will work on this. 
+YouTube and Vimeo are currently supported and function much like a HTML5 video. Check the relevant documentation sections for any differences.
 
 ## Fullscreen
 
-Fullscreen in Plyr is supported for all browsers that [currently support it](http://caniuse.com/#feat=fullscreen). If you're using the default CSS, you can also use a "full browser" mode which will use the full browser window by adding the `player-fullscreen` class to your container.
+Fullscreen in Plyr is supported for all browsers that [currently support it](http://caniuse.com/#feat=fullscreen). If you're using the default CSS, you can also use a "full browser" mode which will use the full browser window by adding the `plyr-fullscreen` class to your container.
 
 ## Browser support
 
@@ -452,7 +778,7 @@ Fullscreen in Plyr is supported for all browsers that [currently support it](htt
 
 &sup3; IE10 has no native fullscreen support, fallback can be used (see options)
 
-The `enabled` option can be used to disable certain User Agents. For example, if you don't want to use Plyr for smartphones, you could use: 
+The `enabled` option can be used to disable certain User Agents. For example, if you don't want to use Plyr for smartphones, you could use:
 
 ```javascript
 enabled: /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent)
@@ -462,13 +788,13 @@ If a User Agent is disabled but supports `<video>` and `<audio>` natively, it wi
 Any unsupported browsers will display links to download the media if the correct html is used.
 
 ### Checking for support
-There's an API method for checking support. You can call `plyr.supported()` and optionally pass a type to it, e.g. `plyr.supported("video")`. It will return an object with two keys; `basic` meaning there's basic support for that media type (or both if no type is passed) and `full` meaning there's full support for plyr. 
+There's an API method for checking support. You can call `plyr.supported()` and optionally pass a type to it, e.g. `plyr.supported("video")`. It will return an object with two keys; `basic` meaning there's basic support for that media type (or both if no type is passed) and `full` meaning there's full support for plyr.
 
 ## Issues
 If you find anything weird with Plyr, please let us know using the GitHub issues tracker.
 
 ## Author
-Plyr is developed by [@sam_potts](https://twitter.com/sam_potts) / [sampotts.me](http://sampotts.me) with help from the awesome [contributors](https://github.com/Selz/plyr/graphs/contributors) 
+Plyr is developed by [@sam_potts](https://twitter.com/sam_potts) / [sampotts.me](http://sampotts.me) with help from the awesome [contributors](https://github.com/Selz/plyr/graphs/contributors)
 
 ## Mentions
 - [The Changelog](http://thechangelog.com/plyr-simple-html5-media-player-custom-controls-webvtt-captions/)
@@ -483,7 +809,7 @@ Plyr is developed by [@sam_potts](https://twitter.com/sam_potts) / [sampotts.me]
 ## Used by
 - [Selz.com](https://selz.com)
 
-Let me know on [Twitter](https://twitter.com/sam_potts) I can add you to the above list. It'd be awesome to see how you're using Plyr :-) 
+Let me know on [Twitter](https://twitter.com/sam_potts) I can add you to the above list. It'd be awesome to see how you're using Plyr :-)
 
 ## Useful links and credits
 Credit to the PayPal HTML5 Video player from which Plyr's caption functionality is ported from:

src/less/plyr.less

@@ -7,73 +7,78 @@
 // -------------------------------
 
 // Colors
-@blue:                      #3498DB;
-@gray-dark:                 #343F4A;
-@gray:                      #565D64;
-@gray-light:                #6B7D86;
-@gray-lighter:              #CBD0D3;
-@off-white:                 #D6DADD;
+@plyr-blue:                      #3498DB;
+@plyr-gray-dark:                 #343F4A;
+@plyr-gray:                      #565D64;
+@plyr-gray-light:                #6B7D86;
+@plyr-gray-lighter:              #CBD0D3;
+@plyr-off-white:                 #D6DADD;
 
 // Font sizes
-@font-size-small:           14px;
-@font-size-base:            16px;
-@font-size-large:           ceil((@font-size-base * 1.5)); 
+@plyr-font-size-small:           14px;
+@plyr-font-size-base:            16px;
+
+// Captions
+@plyr-font-size-captions-base:   ceil(@plyr-font-size-base * 1.25);
+@plyr-font-size-captions-medium: ceil(@plyr-font-size-base * 1.5);
+@plyr-font-size-captions-large:  (@plyr-font-size-base * 2);
 
 // Controls
-@control-spacing:           10px;
-@controls-bg:               #fff;
-@control-bg-hover:          @blue;
-.contrast-control-color(@controls-bg);
-.contrast-control-color-hover(@control-bg-hover);
+@plyr-control-spacing:           10px;
+@plyr-controls-bg:               #fff;
+@plyr-control-bg-hover:          @plyr-blue;
+.contrast-control-color(@plyr-controls-bg);
+.contrast-control-color-hover(@plyr-control-bg-hover);
 
 // Tooltips
-@tooltip-bg:                @controls-bg;
-@tooltip-color:             @control-color;
-@tooltip-padding:           @control-spacing;   
-@tooltip-arrow-size:        5px;
-@tooltip-radius:            3px;
+@plyr-tooltip-bg:                @plyr-controls-bg;
+@plyr-tooltip-border-color:      fade(darken(@plyr-controls-bg, 5%), 10%);
+@plyr-tooltip-border-width:      1px;
+@plyr-tooltip-shadow:            0 0 5px @plyr-tooltip-border-color, 0 0 0 @plyr-tooltip-border-width @plyr-tooltip-border-color;
+@plyr-tooltip-color:             @plyr-control-color;
+@plyr-tooltip-padding:           @plyr-control-spacing;
+@plyr-tooltip-arrow-size:        6px;
+@plyr-tooltip-radius:            3px;
 
 // Progress
-@progress-bg:               rgba(red(@gray), green(@gray), blue(@gray), .2);
-@progress-playing-bg:       @blue;
-@progress-buffered-bg:      rgba(red(@gray), green(@gray), blue(@gray), .25);
-@progress-loading-size:     40px;
-@progress-loading-bg:       rgba(0,0,0, .15);
+@plyr-progress-bg:               fade(@plyr-gray, 20%);
+@plyr-progress-playing-bg:       @plyr-blue;
+@plyr-progress-buffered-bg:      fade(@plyr-gray, 25%);
+@plyr-progress-loading-size:     40px;
+@plyr-progress-loading-bg:       fade(#000, 15%);
 
 // Volume
-@volume-track-height:       6px;
-@volume-track-bg:           darken(@controls-bg, 10%);
-@volume-thumb-height:       (@volume-track-height * 2);
-@volume-thumb-width:        (@volume-track-height * 2);
-@volume-thumb-bg:           @control-color;
-@volume-thumb-bg-focus:     @control-bg-hover;
+@plyr-volume-track-height:       6px;
+@plyr-volume-track-bg:           darken(@plyr-controls-bg, 10%);
+@plyr-volume-thumb-height:       (@plyr-volume-track-height * 2);
+@plyr-volume-thumb-width:        (@plyr-volume-track-height * 2);
+@plyr-volume-thumb-bg:           @plyr-control-color;
+@plyr-volume-thumb-bg-focus:     @plyr-control-bg-hover;
 
 // Breakpoints
-@bp-control-split:          560px; // When controls split into left/right
-@bp-captions-large:         768px; // When captions jump to the larger font size
+@plyr-bp-control-split:          560px; // When controls split into left/right
+@plyr-bp-captions-large:         768px; // When captions jump to the larger font size
 
 // Animation
 // ---------------------------------------
-
-@keyframes progress {
-    to { background-position: @progress-loading-size 0; }
+@keyframes plyr-progress {
+    to { background-position: @plyr-progress-loading-size 0; }
 }
 
 // Mixins
 // -------------------------------
-
 // Contrast
-.contrast-control-color(@color: "") when (lightness(@color) >= 65%) {
-    @control-color: @gray-light;
+.contrast-control-color(@plyr-color: "") when (lightness(@plyr-color) >= 65%) {
+    @plyr-control-color: @plyr-gray-light;
 }
-.contrast-control-color(@color: "") when (lightness(@color) < 65%) {
-    @control-color: @gray-lighter;
+.contrast-control-color(@plyr-color: "") when (lightness(@plyr-color) < 65%) {
+    @plyr-control-color: @plyr-gray-lighter;
 }
-.contrast-control-color-hover(@color: "") when (lightness(@color) >= 65%) {
-    @control-color-hover: @gray;
+.contrast-control-color-hover(@plyr-color: "") when (lightness(@plyr-color) >= 65%) {
+    @plyr-control-color-hover: @plyr-gray;
 }
-.contrast-control-color-hover(@color: "") when (lightness(@color) < 65%) {
-    @control-color-hover: #fff;
+.contrast-control-color-hover(@plyr-color: "") when (lightness(@plyr-color) < 65%) {
+    @plyr-control-color-hover: #fff;
 }
 
 // Font smoothing
@@ -86,62 +91,38 @@
     -webkit-font-smoothing: subpixel-antialiased;
 }
 
-// Contain floats: nicolasgallagher.com/micro-clearfix-hack/
-.clearfix() {
-    zoom: 1;
-    &:before, 
-    &:after { content: ""; display: table; }
-    &:after { clear: both; }
-}
-// Tab focus styles
-.tab-focus() {
-    outline: thin dotted #000;
-    outline-offset: 0;
-}
-
 // <input type="range"> styling
 .volume-thumb() {
-    height: @volume-thumb-height;
-    width: @volume-thumb-width;
-    background: @volume-thumb-bg;
+    height: @plyr-volume-thumb-height;
+    width: @plyr-volume-thumb-width;
+    background: @plyr-volume-thumb-bg;
     border: 0;
-    border-radius: (@volume-thumb-height / 2);
+    border-radius: 100%;
     transition: background .3s ease;
     cursor: ew-resize;
 }
 .volume-track() {
-    height: @volume-track-height;
-    background: @volume-track-bg;
+    height: @plyr-volume-track-height;
+    background: @plyr-volume-track-bg;
     border: 0;
-    border-radius: (@volume-track-height / 2);
+    border-radius: (@plyr-volume-track-height / 2);
 }
 .seek-thumb() {
     background: transparent;
     border: 0;
-    width: (@control-spacing * 2);
-    height: @control-spacing;
+    width: (@plyr-control-spacing * 4);
+    height: @plyr-control-spacing;
+    transform: translateX(-50%);
 }
 .seek-track() {
     background: none;
     border: 0;
 }
 
-// Screen reader only
-// -------------------------------
-.sr-only {
-    position: absolute !important;
-    clip: rect(1px, 1px, 1px, 1px);
-    padding: 0 !important;
-    border: 0 !important;
-    height: 1px !important;
-    width: 1px !important;
-    overflow: hidden;
-}
-
 // Styles
 // -------------------------------
-// Base 
-.player {
+// Base
+.plyr {
     position: relative;
     max-width: 100%;
     min-width: 290px;
@@ -151,12 +132,28 @@
     &,
     *,
     *::after,
-    *::before { 
-        box-sizing: border-box; 
+    *::before {
+        box-sizing: border-box;
+    }
+
+    // Fix 300ms delay
+    a, button, input, label {
+        touch-action: manipulation;
+    }
+
+    // Screen reader only elements
+    &__sr-only {
+        position: absolute !important;
+        clip: rect(1px, 1px, 1px, 1px);
+        padding: 0 !important;
+        border: 0 !important;
+        height: 1px !important;
+        width: 1px !important;
+        overflow: hidden;
     }
 
     // For video
-    &-video-wrapper {
+    &__video-wrapper {
         position: relative;
     }
     video,
@@ -166,11 +163,13 @@
         vertical-align: middle;
     }
 
-    // For embeds
-    &-video-embed {
+    // Container for embeds
+    &__video-embed {
         padding-bottom: 56.25%; /* 16:9 */
         height: 0;
-        
+        overflow: hidden;
+        background: #000;
+
         iframe {
             position: absolute;
             top: 0;
@@ -178,73 +177,96 @@
             width: 100%;
             height: 100%;
             border: 0;
+            user-select: none;
+            pointer-events: none; // To allow mouse events to be captured
+        }
+
+        // Vimeo hack
+        > div {
+            position: relative;
+            padding-bottom: 200%;
+            transform: translateY(-35.95%);
         }
     }
 
     // Captions
-    &-captions {
+    &__captions {
         display: none;
         position: absolute;
         bottom: 0;
         left: 0;
         width: 100%;
-        padding: 20px;
-        min-height: 2.5em;
+        padding: (@plyr-control-spacing * 2) (@plyr-control-spacing * 2) (@plyr-control-spacing * 3);
         color: #fff;
-        font-size: @font-size-base;
-        font-weight: 600;
-        text-shadow: 
-        -1px -1px 0 @gray, 
-        1px -1px 0 @gray, 
-        -1px 1px 0 @gray, 
-        1px 1px 0 @gray;
+        font-size: @plyr-font-size-captions-base;
         text-align: center;
         .font-smoothing();
 
-        @media (min-width: @bp-captions-large) {
-            font-size: @font-size-large;
+        span {
+            border-radius: 2px;
+            padding: 3px 10px;
+            background: fade(#000, 90%);
+        }
+        span:empty {
+            display: none;
+        }
+
+        @media (min-width: @plyr-bp-captions-large) {
+            font-size: @plyr-font-size-captions-medium;
         }
     }
-    &.captions-active &-captions {
+    &--captions-active &__captions {
         display: block;
     }
+    &--fullscreen-active &__captions {
+        font-size: @plyr-font-size-captions-large;
+    }
 
-    // Player controls
-    &-controls {
-        .clearfix();
+    // Playback controls
+    &__controls {
         .font-smoothing();
         position: relative;
-        padding: @control-spacing;
-        background: @controls-bg;
+        padding: @plyr-control-spacing;
+        background: @plyr-controls-bg;
         line-height: 1;
         text-align: center;
-        box-shadow: 0 1px 1px rgba(red(@gray-dark), green(@gray-dark), blue(@gray-dark), .2);
+        box-shadow: 0 1px 1px fade(@plyr-gray-dark, 20%);
+
+        // Clear floats
+        &::after {
+            content: '';
+            display: table;
+            clear: both;
+        }
 
         // Layout
-        &-right {
+        &--right {
             display: block;
-            margin: @control-spacing auto 0;
+            margin: @plyr-control-spacing auto 0;
         }
-        @media (min-width: @bp-control-split) {
-            &-left {
+        @media (min-width: @plyr-bp-control-split) {
+            &--left {
                 float: left;
             }
-            &-right {
+            &--right {
                 float: right;
                 margin-top: 0;
             }
         }
-        
-        input + label, 
+
+        // Buttons
         button {
             display: inline-block;
             vertical-align: middle;
             margin: 0 2px;
-            padding: (@control-spacing / 2) @control-spacing;
-            
-            transition: background .3s ease, color .3s ease, opacity .3s ease;
+            padding: (@plyr-control-spacing / 2) @plyr-control-spacing;
+            overflow: hidden;
+            border: 0;
+            background: transparent;
             border-radius: 3px;
             cursor: pointer;
+            color: @plyr-control-color;
+            transition: background .3s ease, color .3s ease, opacity .3s ease;
 
             svg {
                 width: 18px;
@@ -253,141 +275,139 @@
                 fill: currentColor;
                 transition: fill .3s ease;
             }
+
+            // Hover and tab focus
+            &.tab-focus:focus,
+            &:hover {
+                background: @plyr-control-bg-hover;
+                color: @plyr-control-color-hover;
+            }
+            // Default focus
+            &:focus {
+                outline: 0;
+            }
         }
-        input + label,
-        .inverted:checked + label {
-            opacity: .5;
-        }
-        button, 
-        .inverted + label,
-        input:checked + label {
-            color: @control-color;
-            opacity: 1;
-        }
-        button {
-            border: 0;
-            background: transparent;
-            overflow: hidden;
-        }
-        
-        // Specificity for overriding .inverted
-        button:focus,
-        button:hover,
-        [type="checkbox"]:focus + label,
-        [type="checkbox"] + label:hover {
-            background: @control-bg-hover;
-            color: @control-color-hover;
-            opacity: 1;
-        }
-        button:focus,
-        input:focus + label {
-            outline: 0;
-        }
-        .icon-exit-fullscreen,
-        .icon-muted,
-        .icon-captions-on {
+
+        // Hide toggle icons by default
+        .icon--exit-fullscreen,
+        .icon--muted,
+        .icon--captions-on {
             display: none;
         }
-        .player-time {
+
+        // plyr time
+        .plyr__time {
             display: inline-block;
             vertical-align: middle;
-            margin-left: @control-spacing;
-            color: @control-color;
+            margin-left: @plyr-control-spacing;
+            color: @plyr-control-color;
             font-weight: 600;
-            font-size: @font-size-small;
-            .font-smoothing();
+            font-size: @plyr-font-size-small;
         }
 
         // Media duration hidden on small screens
-        .player-time + .player-time {
+        .plyr__time + .plyr__time {
             display: none;
 
-            @media (min-width: @bp-control-split) {
+            @media (min-width: @plyr-bp-control-split) {
                 display: inline-block;
             }
 
             // Add a slash in before
             &::before {
-                content: "\2044";
-                margin-right: @control-spacing;
+                content: '\2044';
+                margin-right: @plyr-control-spacing;
             }
         }
     }
 
     // Tooltips
-    &-tooltip {
-        @border-base: darken(@tooltip-bg, 8%);
-
+    &__tooltip {
         visibility: hidden;
         position: absolute;
         z-index: 2;
         bottom: 100%;
-        margin-bottom: @tooltip-padding;
-        padding: @tooltip-padding (@tooltip-padding * 1.5);
+        margin-bottom: @plyr-tooltip-padding;
+        padding: @plyr-tooltip-padding (@plyr-tooltip-padding * 1.5);
 
         opacity: 0;
-        background: @tooltip-bg;
-        border: 1px solid @border-base;
-        border-radius: @tooltip-radius;
-        color: @tooltip-color;
-        font-size: @font-size-small;
+        background: @plyr-tooltip-bg;
+        box-shadow: @plyr-tooltip-shadow;
+        border-radius: @plyr-tooltip-radius;
+        color: @plyr-tooltip-color;
+        font-size: @plyr-font-size-small;
         line-height: 1.5;
         font-weight: 600;
 
-        transform: translate(-50%, (@tooltip-padding * 3)) scale(0);
+        transform: translate(-50%, 10px) scale(.8);
         transform-origin: 50% 100%;
-        transition: transform .2s .1s ease, opacity .2s .1s ease;
-      
-        // Arrow
-        &::after {
-            content: "";
+        transition: transform .2s .1s ease, opacity .2s .1s ease, visibility .3s ease;
+
+        // Arrows
+        &::after,
+        &::before {
+            content: '';
             position: absolute;
-            z-index: 1;
+            width: 0;
+            height: 0;
             top: 100%;
             left: 50%;
-            display: block;
-            width: 10px;
-            height: 10px;
-            background: @tooltip-bg;
-            transform: translate(-50%, -50%) rotate(45deg) translateY(2px);
-            
-            @arrow-border-color: darken(@border-base, 5%);
-            border: 1px solid rgba(red(@arrow-border-color), green(@arrow-border-color), blue(@arrow-border-color), .8);
-            border-width: 0 1px 1px 0;
+            transform: translateX(-50%);
+        }
+        // The border triangle
+        &::after {
+            @plyr-border-arrow-size: (@plyr-tooltip-arrow-size + (@plyr-tooltip-border-width * 1));
+            bottom: -(@plyr-border-arrow-size + @plyr-tooltip-border-width);
+            border-right: @plyr-border-arrow-size solid transparent;
+            border-top: @plyr-border-arrow-size solid @plyr-tooltip-border-color;
+            border-left: @plyr-border-arrow-size solid transparent;
+            z-index: 1;
+        }
+        // The background triangle
+        &::before {
+            bottom: -@plyr-tooltip-arrow-size;
+            border-right: @plyr-tooltip-arrow-size solid transparent;
+            border-top: @plyr-tooltip-arrow-size solid @plyr-tooltip-bg;
+            border-left: @plyr-tooltip-arrow-size solid transparent;
+            z-index: 2;
         }
     }
-    label:hover .player-tooltip,
-    input.tab-focus:focus + label .player-tooltip, 
-    button:hover .player-tooltip,
-    button.tab-focus:focus .player-tooltip {
+    button:hover .plyr__tooltip,
+    button.tab-focus:focus .plyr__tooltip,
+    &__tooltip--visible {
         visibility: visible;
         opacity: 1;
         transform: translate(-50%, 0) scale(1);
     }
-    label:hover .player-tooltip,
-    button:hover .player-tooltip {
+    button:hover .plyr__tooltip {
         z-index: 3;
     }
 
-    // Player progress
+    // Common range styles
+    input[type='range'].tab-focus:focus {
+        outline: 1px dotted fade(@plyr-gray-dark, 80%);
+        outline-offset: 3px;
+    }
+
+    // Playback progress
     // <progress> element
-    &-progress {
+    &__progress {
         position: absolute;
         bottom: 100%;
         left: 0;
         right: 0;
         width: 100%;
-        height: @control-spacing;
-        background: @progress-bg;
+        height: @plyr-control-spacing;
+        background: @plyr-progress-bg;
 
-        &-buffer[value],
-        &-played[value],
-        &-seek[type=range] {
+        &--buffer[value],
+        &--played[value],
+        &--seek[type='range'] {
             position: absolute;
             left: 0;
             top: 0;
             width: 100%;
-            height: @control-spacing;
+            height: @plyr-control-spacing;
             margin: 0;
             padding: 0;
             vertical-align: top;
@@ -397,32 +417,35 @@
             border: none;
             background: transparent;
         }
-        &-buffer[value],
-        &-played[value] {   
+        &--buffer[value],
+        &--played[value] {
             &::-webkit-progress-bar {
                 background: transparent;
+                transition: width .2s ease;
             }
 
             // Inherit from currentColor;
             &::-webkit-progress-value {
                 background: currentColor;
+                transition: width .2s ease;
             }
             &::-moz-progress-bar {
                 background: currentColor;
+                transition: width .2s ease;
             }
         }
-        &-played[value] {
+        &--played[value] {
             z-index: 2;
-            color: @progress-playing-bg;
+            color: @plyr-progress-playing-bg;
         }
-        &-buffer[value] {
-            color: @progress-buffered-bg;
+        &--buffer[value] {
+            color: @plyr-progress-buffered-bg;
         }
 
         // Seek control
         // <input[type='range']> element
         // Specificity is for bootstrap compatibility
-        &-seek[type=range] {
+        &--seek[type='range'] {
             z-index: 4;
             cursor: pointer;
             outline: 0;
@@ -444,7 +467,7 @@
                 -moz-appearance: none;
                 .seek-thumb();
             }
-            
+
             // Microsoft
             &::-ms-track {
                 color: transparent;
@@ -465,57 +488,62 @@
                 border: 0;
             }
         }
+
+        // Seek tooltip to show time
+        .plyr__tooltip {
+            left: 0;
+        }
     }
 
     // Loading state
-    &.loading .player-progress-buffer {
-        animation: progress 1s linear infinite;
-        background-size: @progress-loading-size @progress-loading-size;
+    &--loading .plyr__progress--buffer {
+        animation: plyr-progress 1s linear infinite;
+        background-size: @plyr-progress-loading-size @plyr-progress-loading-size;
         background-repeat: repeat-x;
-        background-color: @progress-buffered-bg;
+        background-color: @plyr-progress-buffered-bg;
         background-image: linear-gradient(
-            -45deg, 
-            @progress-loading-bg 25%, 
-            transparent 25%, 
-            transparent 50%, 
-            @progress-loading-bg 50%, 
-            @progress-loading-bg 75%,
-            transparent 75%, 
+            -45deg,
+            @plyr-progress-loading-bg 25%,
+            transparent 25%,
+            transparent 50%,
+            @plyr-progress-loading-bg 50%,
+            @plyr-progress-loading-bg 75%,
+            transparent 75%,
             transparent);
         color: transparent;
     }
 
     // States
-    &-controls [data-player='pause'],
-    &.playing .player-controls [data-player='play'] {
+    &__controls [data-plyr='pause'],
+    &--playing .plyr__controls [data-plyr='play'] {
         display: none;
     }
-    &.playing .player-controls [data-player='pause'] {
+    &--playing .plyr__controls [data-plyr='pause'] {
         display: inline-block;
     }
 
     // Volume control
     // <input[type='range']> element
     // Specificity is for bootstrap compatibility
-    &-volume[type=range] {
+    &__volume[type='range'] {
         display: inline-block;
         vertical-align: middle;
         -webkit-appearance: none;
         -moz-appearance: none;
         width: 100px;
-        margin: 0 @control-spacing 0 0;
-        padding: 0;     
+        margin: 0 @plyr-control-spacing 0 0;
+        padding: 0;
         cursor: pointer;
         background: transparent;
         border: none;
-        
+
         // Webkit
         &::-webkit-slider-runnable-track {
             .volume-track();
         }
         &::-webkit-slider-thumb {
             -webkit-appearance: none;
-            margin-top: -((@volume-thumb-height - @volume-track-height) / 2);
+            margin-top: -((@plyr-volume-thumb-height - @plyr-volume-track-height) / 2);
             .volume-thumb();
         }
 
@@ -526,13 +554,13 @@
         &::-moz-range-thumb {
             .volume-thumb();
         }
-        
+
         // Microsoft
         &::-ms-track {
-            height: @volume-track-height;
+            height: @plyr-volume-track-height;
             background: transparent;
             border-color: transparent;
-            border-width: ((@volume-thumb-height - @volume-track-height) / 2) 0;
+            border-width: ((@plyr-volume-thumb-height - @plyr-volume-track-height) / 2) 0;
             color: transparent;
         }
         &::-ms-fill-lower,
@@ -547,13 +575,13 @@
             outline: 0;
 
             &::-webkit-slider-thumb {
-                background: @volume-thumb-bg-focus;
+                background: @plyr-volume-thumb-bg-focus;
             }
             &::-moz-range-thumb {
-                background: @volume-thumb-bg-focus;
+                background: @plyr-volume-thumb-bg-focus;
             }
             &::-ms-thumb {
-                background: @volume-thumb-bg-focus;
+                background: @plyr-volume-thumb-bg-focus;
             }
         }
     }
@@ -561,31 +589,30 @@
     // Hide sound controls on iOS
     // It's not supported to change volume using JavaScript:
     // https://developer.apple.com/library/safari/documentation/AudioVideo/Conceptual/Using_HTML5_Audio_Video/Device-SpecificConsiderations/Device-SpecificConsiderations.html
-    &.ios &-volume,
-    &.ios [data-player='mute'],
-    &.ios [data-player='mute'] + label,
-    &-audio.ios &-controls-right {
+    &--is-ios &__volume,
+    &--is-ios [data-plyr='mute'],
+    &--is-ios.plyr--audio &__controls--right {
         display: none;
     }
     // Center buttons so it looks less odd
-    &-audio.ios &-controls-left {
+    &--is-ios.plyr--audio &__controls--left {
         float: none;
     }
 
     // Audio specific styles
     // Position the progress within the container
-    &-audio .player-controls {
-        padding-top: (@control-spacing * 2);
+    &--audio .plyr__controls {
+        padding-top: (@plyr-control-spacing * 2);
     }
-    &-audio .player-progress {
+    &--audio .plyr__progress {
         bottom: auto;
         top: 0;
-        background: @off-white;
+        background: @plyr-off-white;
     }
 
     // Full screen mode
-    &-fullscreen,
-    &.fullscreen-active {
+    &.plyr--fullscreen,
+    &--fullscreen-active {
         position: fixed;
         top: 0;
         left: 0;
@@ -599,48 +626,50 @@
         video {
             height: 100%;
         }
-        .player-video-wrapper {
+        .plyr__video-wrapper {
             height: 100%;
             width: 100%;
-        }  
-        .player-controls {
+        }
+        .plyr__controls {
             position: absolute;
             bottom: 0;
             left: 0;
             right: 0;
         }
+    }
 
-        // Hide controls when playing in full screen
-        &.fullscreen-hide-controls.playing {
-            .player-controls {
-                transform: translateY(100%) translateY(@control-spacing / 2);
-                transition: transform .3s .2s ease;
-            }
-            &.player-hover .player-controls {
-                transform: translateY(0);
-            }
-            .player-captions {
-                bottom: (@control-spacing / 2);
-                transition: bottom .3s .2s ease;
-            }
+    // Hide controls when playing in full screen
+    &--fullscreen-active.plyr--fullscreen--hide-controls.plyr--playing,
+    &.plyr--fullscreen.plyr--fullscreen--hide-controls.plyr--playing {
+        .plyr__controls {
+            transform: translateY(100%) translateY(@plyr-control-spacing / 2);
+            transition: transform .3s .2s ease;
         }
+        .plyr__captions {
+            bottom: (@plyr-control-spacing / 2);
+            transition: bottom .3s .2s ease;
+        }
+        &.plyr--hover .plyr__controls {
+            transform: translateY(0);
+        }
+    }
 
-        // Captions
-        .player-captions,
-        &.fullscreen-hide-controls.playing.player-hover .player-captions {
-            top: auto;
-            bottom: 90px;
+    // Captions
+    &.plyr--fullscreen .plyr__captions,
+    &--fullscreen-active .plyr__captions,
+    &--fullscreen--hide-controls.plyr--fullscreen-active.plyr--playing.plyr--hover .plyr__captions {
+        top: auto;
+        bottom: 90px;
 
-            @media (min-width: @bp-control-split) {
-                bottom: 60px;
-            }
+        @media (min-width: @plyr-bp-control-split) {
+            bottom: 60px;
         }
     }
 
     // Change icons on state change
-    &.fullscreen-active .icon-exit-fullscreen,
-    &.muted .player-controls .icon-muted,
-    &.captions-active .player-controls .icon-captions-on {
+    &--fullscreen-active .icon--exit-fullscreen,
+    &--muted .plyr__controls .icon--muted,
+    &--captions-active .plyr__controls .icon--captions-on {
         display: block;
 
         & + svg {
@@ -649,16 +678,12 @@
     }
 
     // Some options are hidden by default
-    [data-player='captions'],
-    [data-player='captions'] + label,
-    [data-player='fullscreen'],
-    [data-player='fullscreen'] + label {
+    [data-plyr='captions'],
+    [data-plyr='fullscreen'] {
         display: none;
     }
-    &.captions-enabled [data-player='captions'],
-    &.captions-enabled [data-player='captions'] + label,
-    &.fullscreen-enabled [data-player='fullscreen'],
-    &.fullscreen-enabled [data-player='fullscreen'] + label {
+    &--captions-enabled [data-plyr='captions'],
+    &--fullscreen-enabled [data-plyr='fullscreen'] {
         display: inline-block;
     }
-}
+}

src/sass/plyr.scss

@@ -7,77 +7,76 @@
 // -------------------------------
 
 // Colors
-$blue:                    #3498DB !default;
-$gray-dark:               #343F4A !default;
-$gray:                    #565D64 !default;
-$gray-light:              #6B7D86 !default;
-$gray-lighter:            #CBD0D3 !default;
-$off-white:               #D6DADD !default;
+$plyr-blue:                      #3498DB !default;
+$plyr-gray-dark:                 #343F4A !default;
+$plyr-gray:                      #565D64 !default;
+$plyr-gray-light:                #6B7D86 !default;
+$plyr-gray-lighter:              #CBD0D3 !default;
+$plyr-off-white:                 #D6DADD !default;
 
 // Font sizes
-$font-size-small:         14px !default;
-$font-size-base:          16px !default;
-$font-size-large:         ceil(($font-size-base * 1.5)) !default;
+$plyr-font-size-small:           14px !default;
+$plyr-font-size-base:            16px !default;
+
+// Captions
+$plyr-font-size-captions-base:   ceil($plyr-font-size-base * 1.25) !default;
+$plyr-font-size-captions-medium: ceil($plyr-font-size-base * 1.5) !default;
+$plyr-font-size-captions-large:  ($plyr-font-size-base * 2) !default;
 
 // Controls
-$control-spacing:         10px !default;
-$controls-bg:             #fff !default;
-$control-bg-hover:        @blue !default;
-.contrast-control-color($controls-bg);
-.contrast-control-color-hover($control-bg-hover);
+$plyr-control-spacing:           10px !default;
+$plyr-controls-bg:               #fff !default;
+$plyr-control-bg-hover:          $plyr-blue !default;
+$plyr-control-color:             null !default;
+$plyr-control-color-hover:       null !default;
+
+// Contrast
+@if lightness($plyr-controls-bg) >= 65% {
+    $plyr-control-color: $plyr-gray-light;
+}
+@else {
+    $plyr-control-color: $plyr-gray-lighter;
+}
+@if lightness($plyr-control-bg-hover) >= 65% {
+    $plyr-control-color-hover: $plyr-gray;
+}
+@else {
+    $plyr-control-color-hover: #fff;
+}
 
 // Tooltips
-$tooltip-bg:              $controls-bg !default;
-$tooltip-color:           $control-color !default;
-$tooltip-padding:         $control-spacing !default;
-$tooltip-arrow-size:      5px !default;
-$tooltip-radius:          3px !default;
+$plyr-tooltip-bg:                $plyr-controls-bg !default;
+$plyr-tooltip-border-color:      transparentize($plyr-gray-dark, .1) !default;
+$plyr-tooltip-border-width:      1px;
+$plyr-tooltip-shadow:            0 0 5px $plyr-tooltip-border-color, 0 0 0 $plyr-tooltip-border-width $plyr-tooltip-border-color;
+$plyr-tooltip-color:             $plyr-control-color !default;
+$plyr-tooltip-padding:           $plyr-control-spacing !default;
+$plyr-tooltip-arrow-size:        6px !default;
+$plyr-tooltip-radius:            3px !default;
 
 // Progress
-$progress-bg:             rgba(red($gray), green($gray), blue($gray), .2) !default;
-$progress-playing-bg:     $blue !default;
-$progress-buffered-bg:    rgba(red($gray), green($gray), blue($gray), .25) !default;
-$progress-loading-size:   40px !default;
-$progress-loading-bg:     rgba(0,0,0, .15) !default;
+$plyr-progress-bg:               transparentize($plyr-gray, .2) !default;
+$plyr-progress-playing-bg:       $plyr-blue !default;
+$plyr-progress-buffered-bg:      transparentize($plyr-gray, .25) !default;
+$plyr-progress-loading-size:     40px !default;
+$plyr-progress-loading-bg:       transparentize(#000, .15) !default;
 
 // Volume
-$volume-track-height:     6px !default;
-$volume-track-bg:         darken($controls-bg, 10%) !default;
-$volume-thumb-height:     ($volume-track-height * 2) !default;
-$volume-thumb-width:      ($volume-track-height * 2) !default;
-$volume-thumb-bg:         $control-color !default;
-$volume-thumb-bg-focus:   $control-bg-hover !default;
+$plyr-volume-track-height:       6px !default;
+$plyr-volume-track-bg:           darken($plyr-controls-bg, 10%) !default;
+$plyr-volume-thumb-height:       ($plyr-volume-track-height * 2) !default;
+$plyr-volume-thumb-width:        ($plyr-volume-track-height * 2) !default;
+$plyr-volume-thumb-bg:           $plyr-control-color !default;
+$plyr-volume-thumb-bg-focus:     $plyr-control-bg-hover !default;
 
 // Breakpoints
-$bp-control-split:        560px !default; // When controls split into left/right
-$bp-captions-large:       768px !default; // When captions jump to the larger font size
+$plyr-bp-control-split:          560px !default; // When controls split into left/right
+$plyr-bp-captions-large:         768px !default; // When captions jump to the larger font size
 
 // Animation
 // ---------------------------------------
-
-@keyframes progress {
-    to { background-position: $progress-loading-size 0; }
-}
-
-// Mixins
-// -------------------------------
-
-// Contrast
-@mixin contrast-control-color($color: "") {
-    @if (lightness($color) >= 65%) {
-        $control-color: $gray-light;
-    }
-    @else if(lightness(@color) < 65%) {
-        $control-color: $gray-lighter;
-    }
-}
-@mixin contrast-control-color-hover($color: "") {
-    @if (lightness($color) >= 65%) {
-        $control-color-hover: $gray;
-    }
-    @else if (lightness($color) < 65%) {
-        $control-color-hover: #fff;
-    }
+@keyframes plyr-progress {
+    to { background-position: $plyr-progress-loading-size 0; }
 }
 
 // Font smoothing
@@ -86,75 +85,45 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
     @if ($mode == 'on') {
         -moz-osx-font-smoothing: grayscale;
         -webkit-font-smoothing: antialiased;
-    } 
+    }
     @else if ($mode == 'off') {
         -moz-osx-font-smoothing: auto;
         -webkit-font-smoothing: subpixel-antialiased;
     }
 }
 
-// Contain floats: nicolasgallagher.com/micro-clearfix-hack/
-@mixin clearfix()
-{
-    zoom: 1;
-    &:before,
-    &:after { content: ""; display: table; }
-    &:after { clear: both; }
-}
-// Tab focus styles
-@mixin tab-focus()
-{
-    outline: thin dotted #000;
-    outline-offset: 0;
-}
-
-// Range mixins
-@mixin volume-thumb()
-{
-    height: $volume-thumb-height;
-    width: $volume-thumb-width;
-    background: $volume-thumb-bg;
+// <input type="range"> styling
+@mixin volume-thumb() {
+    height: $plyr-volume-thumb-height;
+    width: $plyr-volume-thumb-width;
+    background: $plyr-volume-thumb-bg;
     border: 0;
-    border-radius: ($volume-thumb-height / 2);
+    border-radius: 100%;
     transition: background .3s ease;
     cursor: ew-resize;
 }
-@mixin volume-track()
-{
-    height: $volume-track-height;
-    background: $volume-track-bg;
+@mixin volume-track() {
+    height: $plyr-volume-track-height;
+    background: $plyr-volume-track-bg;
     border: 0;
-    border-radius: ($volume-track-height / 2);
+    border-radius: ($plyr-volume-track-height / 2);
 }
-@mixin seek-thumb()
-{
+@mixin seek-thumb() {
     background: transparent;
     border: 0;
-    width: ($control-spacing * 2);
-    height: $control-spacing;
+    width: ($plyr-control-spacing * 4);
+    height: $plyr-control-spacing;
+    transform: translateX(-50%);
 }
-@mixin seek-track()
-{
+@mixin seek-track() {
     background: none;
     border: 0;
 }
 
-// Screen reader only
-// -------------------------------
-.sr-only {
-    position: absolute !important;
-    clip: rect(1px, 1px, 1px, 1px);
-    padding: 0 !important;
-    border: 0 !important;
-    height: 1px !important;
-    width: 1px !important;
-    overflow: hidden;
-}
-
 // Styles
 // -------------------------------
 // Base
-.player {
+.plyr {
     position: relative;
     max-width: 100%;
     min-width: 290px;
@@ -168,8 +137,24 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
         box-sizing: border-box;
     }
 
+    // Fix 300ms delay
+    a, button, input, label {
+        touch-action: manipulation;
+    }
+
+    // Screen reader only
+    &__sr-only {
+        position: absolute !important;
+        clip: rect(1px, 1px, 1px, 1px);
+        padding: 0 !important;
+        border: 0 !important;
+        height: 1px !important;
+        width: 1px !important;
+        overflow: hidden;
+    }
+
     // For video
-    &-video-wrapper {
+    &__video-wrapper {
         position: relative;
     }
     video,
@@ -179,70 +164,110 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
         vertical-align: middle;
     }
 
+    // For embeds
+    &__video-embed {
+        padding-bottom: 56.25%; /* 16:9 */
+        height: 0;
+        overflow: hidden;
+        background: #000;
+
+        iframe {
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            border: 0;
+            user-select: none;
+            pointer-events: none; // To allow mouse events to be captured
+        }
+
+        // Vimeo hack
+        > div {
+            position: relative;
+            padding-bottom: 200%;
+            transform: translateY(-35.95%);
+        }
+    }
+
     // Captions
-    &-captions {
+    &__captions {
         display: none;
         position: absolute;
         bottom: 0;
         left: 0;
         width: 100%;
-        padding: 20px;
-        min-height: 2.5em;
+        padding: ($plyr-control-spacing * 2) ($plyr-control-spacing * 2) ($plyr-control-spacing * 3);
         color: #fff;
-        font-size: $font-size-base;
-        font-weight: 600;
-        text-shadow:
-        -1px -1px 0 $gray,
-        1px -1px 0 $gray,
-        -1px 1px 0 $gray,
-        1px 1px 0 $gray;
+        font-size: $plyr-font-size-captions-base;
         text-align: center;
         @include font-smoothing();
 
-        @media (min-width: $bp-captions-large) {
-            font-size: $font-size-large;
+        span {
+            border-radius: 2px;
+            padding: 3px 10px;
+            background: transparentize(#000, .9);
+        }
+        span:empty {
+            display: none;
+        }
+
+        @media (min-width: $plyr-bp-captions-large) {
+            font-size: $plyr-font-size-captions-medium;
         }
     }
-    &.captions-active &-captions {
+    &--captions-active &__captions {
         display: block;
     }
+    &--fullscreen-active &__captions {
+        font-size: $plyr-font-size-captions-large;
+    }
 
-    // Player controls
-    &-controls {
-        @include clearfix();
+    // Playback controls
+    &__controls {
         @include font-smoothing();
         position: relative;
-        padding: $control-spacing;
-        background: $controls-bg;
+        padding: $plyr-control-spacing;
+        background: $plyr-controls-bg;
         line-height: 1;
         text-align: center;
-        box-shadow: 0 1px 1px rgba(red($gray-dark), green($gray-dark), blue($gray-dark), .2);
+        box-shadow: 0 1px 1px transparentize($plyr-gray-dark, .2);
+
+        // Clear floats
+        &::after {
+            content: '';
+            display: table;
+            clear: both;
+        }
 
         // Layout
-        &-right {
+        &--right {
             display: block;
-            margin: $control-spacing auto 0;
+            margin: $plyr-control-spacing auto 0;
         }
-        @media (min-width: $bp-control-split) {
-            &-left {
+        @media (min-width: $plyr-bp-control-split) {
+            &--left {
                 float: left;
             }
-            &-right {
+            &--right {
                 float: right;
                 margin-top: 0;
             }
         }
 
-        input + label,
+        // Buttons
         button {
             display: inline-block;
             vertical-align: middle;
             margin: 0 2px;
-            padding: ($control-spacing / 2) $control-spacing;
-
-            background .3s ease, color .3s ease, opacity .3s ease;
+            padding: ($plyr-control-spacing / 2) $plyr-control-spacing;
+            overflow: hidden;
+            border: 0;
+            background: transparent;
             border-radius: 3px;
             cursor: pointer;
+            color: $plyr-control-color;
+            transition: background .3s ease, color .3s ease, opacity .3s ease;
 
             svg {
                 width: 18px;
@@ -251,141 +276,139 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
                 fill: currentColor;
                 transition: fill .3s ease;
             }
-        }
-        input + label,
-        .inverted:checked + label {
-            opacity: .5;
-        }
-        button,
-        .inverted + label,
-        input:checked + label {
-            color: $control-color;
-            opacity: 1;
-        }
-        button {
-            border: 0;
-            background: transparent;
-            overflow: hidden;
+
+            // Hover and tab focus
+            &.tab-focus:hover,
+            &:hover {
+                background: $plyr-control-bg-hover;
+                color: $plyr-control-color-hover;
+            }
+            // Default focus
+            &:focus {
+                outline: 0;
+            }
         }
 
-        // Specificity for overriding .inverted
-        button:focus,
-        button:hover,
-        [type="checkbox"]:focus + label,
-        [type="checkbox"] + label:hover {
-            background: $control-bg-hover;
-            color: $control-color-hover;
-            opacity: 1;
-        }
-        button:focus,
-        input:focus + label {
-            outline: 0;
-        }
-        .icon-exit-fullscreen,
-        .icon-muted,
-        .icon-captions-on {
+        // Hide toggle icons by default
+        .icon--exit-fullscreen,
+        .icon--muted,
+        .icon--captions-on {
             display: none;
         }
-        .player-time {
+
+        // Time display
+        .plyr__time {
             display: inline-block;
             vertical-align: middle;
-            margin-left: $control-spacing;
-            color: $control-color;
+            margin-left: $plyr-control-spacing;
+            color: $plyr-control-color;
             font-weight: 600;
-            font-size: $font-size-small;
-            @include font-smoothing();
+            font-size: $plyr-font-size-small;
         }
 
         // Media duration hidden on small screens
-        .player-time + .player-time {
+        .plyr__time + .plyr__time {
             display: none;
 
-            @media (min-width: $bp-control-split) {
+            @media (min-width: $plyr-bp-control-split) {
                 display: inline-block;
             }
 
             // Add a slash in before
             &::before {
-                content: "\2044";
-                margin-right: $control-spacing;
+                content: '\2044';
+                margin-right: $plyr-control-spacing;
             }
         }
     }
 
     // Tooltips
-    &-tooltip {
-        $border-base: darken($tooltip-bg, 8%);
-
+    &__tooltip {
         visibility: hidden;
         position: absolute;
         z-index: 2;
         bottom: 100%;
-        margin-bottom: $tooltip-padding;
-        padding: $tooltip-padding ($tooltip-padding * 1.5);
+        margin-bottom: $plyr-tooltip-padding;
+        padding: $plyr-tooltip-padding ($plyr-tooltip-padding * 1.5);
 
         opacity: 0;
-        background: $tooltip-bg;
-        border: 1px solid $border-base;
-        border-radius: $tooltip-radius;
-        color: $tooltip-color;
-        font-size: $font-size-small;
+        background: $plyr-tooltip-bg;
+        box-shadow: $plyr-tooltip-shadow;
+        border-radius: $plyr-tooltip-radius;
+        color: $plyr-tooltip-color;
+        font-size: $plyr-font-size-small;
         line-height: 1.5;
         font-weight: 600;
 
-        transform: translate(-50%, ($tooltip-padding * 3)) scale(0);
+        transform: translate(-50%, 10px) scale(.8);
         transform-origin: 50% 100%;
-        transition: transform .2s .1s ease, opacity .2s .1s ease;
+        transition: transform .2s .1s ease, opacity .2s .1s ease, visibility .3s ease;
 
-        // Arrow
-        &::after {
-            content: "";
+        // Arrows
+        &::after,
+        &::before {
+            content: '';
             position: absolute;
-            z-index: 1;
+            width: 0;
+            height: 0;
             top: 100%;
             left: 50%;
-            display: block;
-            width: 10px;
-            height: 10px;
-            background: $tooltip-bg;
-            transform: translate(-50%, -50%) rotate(45deg) translateY(2px);
-            
-            $arrow-border-color: darken($border-base, 5%);
-            border: 1px solid rgba(red($arrow-border-color), green($arrow-border-color), blue($arrow-border-color), .8);
-            border-width: 0 1px 1px 0;
+            transform: translateX(-50%);
+        }
+        // The border triangle
+        &::after {
+            $plyr-border-arrow-size: ($plyr-tooltip-arrow-size + ($plyr-tooltip-border-width * 1));
+            bottom: -($plyr-border-arrow-size + $plyr-tooltip-border-width);
+            border-right: $plyr-border-arrow-size solid transparent;
+            border-top: $plyr-border-arrow-size solid $plyr-tooltip-border-color;
+            border-left: $plyr-border-arrow-size solid transparent;
+            z-index: 1;
+        }
+        // The background triangle
+        &::before {
+            bottom: -$plyr-tooltip-arrow-size;
+            border-right: $plyr-tooltip-arrow-size solid transparent;
+            border-top: $plyr-tooltip-arrow-size solid $plyr-tooltip-bg;
+            border-left: $plyr-tooltip-arrow-size solid transparent;
+            z-index: 2;
         }
     }
-    label:hover .player-tooltip,
-    input.tab-focus:focus + label .player-tooltip, 
-    button:hover .player-tooltip,
-    button.tab-focus:focus .player-tooltip {
+    button:hover .plyr__tooltip,
+    button.tab-focus:focus .plyr__tooltip,
+    &__tooltip--visible {
         visibility: visible;
         opacity: 1;
         transform: translate(-50%, 0) scale(1);
     }
-    label:hover .player-tooltip,
-    button:hover .player-tooltip {
+    button:hover .plyr__tooltip {
         z-index: 3;
     }
 
-    // Player progress
+    // Common range styles
+    input[type='range'].tab-focus:focus {
+        outline: thin dotted transparentize($plyr-gray-dark, .8);
+        outline-offset: 3px;
+    }
+
+    // Playback progress
     // <progress> element
-    &-progress {
+    &__progress {
         position: absolute;
         bottom: 100%;
         left: 0;
         right: 0;
         width: 100%;
-        height: $control-spacing;
-        background: $progress-bg;
+        height: $plyr-control-spacing;
+        background: $plyr-progress-bg;
 
-        &-buffer[value],
-        &-played[value],
-        &-seek[type=range] {
+        &--buffer[value],
+        &--played[value],
+        &--seek[type='range'] {
             position: absolute;
             left: 0;
             top: 0;
             width: 100%;
-            height: $control-spacing;
+            height: $plyr-control-spacing;
             margin: 0;
             padding: 0;
             vertical-align: top;
@@ -395,32 +418,35 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
             border: none;
             background: transparent;
         }
-        &-buffer[value],
-        &-played[value] {
+        &--buffer[value],
+        &--played[value] {
             &::-webkit-progress-bar {
                 background: transparent;
+                transition: width .2s ease;
             }
 
             // Inherit from currentColor;
             &::-webkit-progress-value {
                 background: currentColor;
+                transition: width .2s ease;
             }
             &::-moz-progress-bar {
                 background: currentColor;
+                transition: width .2s ease;
             }
         }
-        &-played[value] {
+        &--played[value] {
             z-index: 2;
-            color: $progress-playing-bg;
+            color: $plyr-progress-playing-bg;
         }
-        &-buffer[value] {
-            color: $progress-buffered-bg;
+        &--buffer[value] {
+            color: $plyr-progress-buffered-bg;
         }
 
         // Seek control
         // <input[type='range']> element
         // Specificity is for bootstrap compatibility
-        &-seek[type=range] {
+        &--seek[type='range'] {
             z-index: 4;
             cursor: pointer;
             outline: 0;
@@ -463,45 +489,50 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
                 border: 0;
             }
         }
+
+        // Seek tooltip to show time
+        .plyr__tooltip {
+            left: 0;
+        }
     }
 
     // Loading state
-    &.loading .player-progress-buffer {
-        animation: progress 1s linear infinite;
-        background-size: $progress-loading-size $progress-loading-size;
+    &--loading .plyr__progress--buffer {
+        animation: plyr-progress 1s linear infinite;
+        background-size: $plyr-progress-loading-size $plyr-progress-loading-size;
         background-repeat: repeat-x;
-        background-color: $progress-buffered-bg;
+        background-color: $plyr-progress-buffered-bg;
         background-image: linear-gradient(
             -45deg,
-            $progress-loading-bg 25%,
+            $plyr-progress-loading-bg 25%,
             transparent 25%,
             transparent 50%,
-            $progress-loading-bg 50%,
-            $progress-loading-bg 75%,
+            $plyr-progress-loading-bg 50%,
+            $plyr-progress-loading-bg 75%,
             transparent 75%,
             transparent);
-            color: transparent;
+        color: transparent;
     }
 
     // States
-    &-controls [data-player='pause'],
-    &.playing .player-controls [data-player='play'] {
+    &__controls [data-plyr='pause'],
+    &--playing .plyr__controls [data-plyr='play'] {
         display: none;
     }
-    &.playing .player-controls [data-player='pause'] {
+    &--playing .plyr__controls [data-plyr='pause'] {
         display: inline-block;
     }
 
     // Volume control
     // <input[type='range']> element
     // Specificity is for bootstrap compatibility
-    &-volume[type=range] {
+    &__volume[type='range'] {
         display: inline-block;
         vertical-align: middle;
         -webkit-appearance: none;
         -moz-appearance: none;
         width: 100px;
-        margin: 0 $control-spacing 0 0;
+        margin: 0 $plyr-control-spacing 0 0;
         padding: 0;
         cursor: pointer;
         background: transparent;
@@ -513,7 +544,7 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
         }
         &::-webkit-slider-thumb {
             -webkit-appearance: none;
-            margin-top: -(($volume-thumb-height - $volume-track-height) / 2);
+            margin-top: -(($plyr-volume-thumb-height - $plyr-volume-track-height) / 2);
             @include volume-thumb();
         }
 
@@ -527,10 +558,10 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
 
         // Microsoft
         &::-ms-track {
-            height: $volume-track-height;
+            height: $plyr-volume-track-height;
             background: transparent;
             border-color: transparent;
-            border-width: (($volume-thumb-height - $volume-track-height) / 2) 0;
+            border-width: (($plyr-volume-thumb-height - $plyr-volume-track-height) / 2) 0;
             color: transparent;
         }
         &::-ms-fill-lower,
@@ -545,13 +576,13 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
             outline: 0;
 
             &::-webkit-slider-thumb {
-                background: $volume-thumb-bg-focus;
+                background: $plyr-volume-thumb-bg-focus;
             }
             &::-moz-range-thumb {
-                background: $volume-thumb-bg-focus;
+                background: $plyr-volume-thumb-bg-focus;
             }
             &::-ms-thumb {
-                background: $volume-thumb-bg-focus;
+                background: $plyr-volume-thumb-bg-focus;
             }
         }
     }
@@ -559,31 +590,30 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
     // Hide sound controls on iOS
     // It's not supported to change volume using JavaScript:
     // https://developer.apple.com/library/safari/documentation/AudioVideo/Conceptual/Using_HTML5_Audio_Video/Device-SpecificConsiderations/Device-SpecificConsiderations.html
-    &.ios &-volume,
-    &.ios [data-player='mute'],
-    &.ios [data-player='mute'] + label,
-    &-audio.ios &-controls-right {
+    &--is-ios &__volume,
+    &--is-ios [data-plyr='mute'],
+    &--is-ios.plyr--audio &__controls--right {
         display: none;
     }
     // Center buttons so it looks less odd
-    &-audio.ios &-controls-left {
+    &--is-ios.plyr--audio &__controls--left {
         float: none;
     }
 
     // Audio specific styles
     // Position the progress within the container
-    &-audio .player-controls {
-        padding-top: ($control-spacing * 2);
+    &--audio .plyr__controls {
+        padding-top: ($plyr-control-spacing * 2);
     }
-    &-audio .player-progress {
+    &--audio .plyr__progress {
         bottom: auto;
         top: 0;
-        background: $off-white;
+        background: $plyr-off-white;
     }
 
     // Full screen mode
-    &-fullscreen,
-    &.fullscreen-active {
+    &--fullscreen,
+    &--fullscreen-active  {
         position: fixed;
         top: 0;
         left: 0;
@@ -597,48 +627,50 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
         video {
             height: 100%;
         }
-        .player-video-wrapper {
+        .plyr__video-wrapper {
             height: 100%;
             width: 100%;
         }
-        .player-controls {
+        .plyr__controls {
             position: absolute;
             bottom: 0;
             left: 0;
             right: 0;
         }
+    }
 
-        // Hide controls when playing in full screen
-        &.fullscreen-hide-controls.playing {
-            .player-controls {
-                transform: translateY(100%) translateY($control-spacing / 2);
-                transition: transform .3s .2s ease;
-            }
-            &.player-hover .player-controls {
-                transform: translateY(0);
-            }
-            .player-captions {
-                bottom: (@control-spacing / 2);
-                transition: bottom .3s .2s ease;
-            }
+    // Hide controls when playing in full screen
+    &--fullscreen-active.plyr--fullscreen--hide-controls.plyr--playing,
+    &.plyr--fullscreen.plyr--fullscreen--hide-controls.plyr--playing {
+        .plyr__controls {
+            transform: translateY(100%) translateY($plyr-control-spacing / 2);
+            transition: transform .3s .2s ease;
         }
+        .plyr__captions {
+            bottom: ($plyr-control-spacing / 2);
+            transition: bottom .3s .2s ease;
+        }
+        &.plyr--hover .plyr__controls {
+            transform: translateY(0);
+        }
+    }
 
-        // Captions
-        .player-captions,
-        &.fullscreen-hide-controls.playing.player-hover .player-captions {
-            top: auto;
-            bottom: 90px;
+    // Captions
+    &.plyr--fullscreen .plyr__captions,
+    &--fullscreen-active .plyr__captions,
+    &--fullscreen--hide-controls.plyr--fullscreen-active.plyr--playing.plyr--hover .plyr__captions {
+        top: auto;
+        bottom: 90px;
 
-            @media (min-width: $bp-control-split) {
-                bottom: 60px;
-            }
+        @media (min-width: $plyr-bp-control-split) {
+            bottom: 60px;
         }
     }
 
     // Change icons on state change
-    &.fullscreen-active .icon-exit-fullscreen,
-    &.muted .player-controls .icon-muted,
-    &.captions-active .player-controls .icon-captions-on {
+    &--fullscreen-active .icon--exit-fullscreen,
+    &--muted .plyr__controls .icon--muted,
+    &--captions-active .plyr__controls .icon--captions-on {
         display: block;
 
         & + svg {
@@ -647,16 +679,12 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
     }
 
     // Some options are hidden by default
-    [data-player='captions'],
-    [data-player='captions'] + label,
-    [data-player='fullscreen'],
-    [data-player='fullscreen'] + label {
+    [data-plyr='captions'],
+    [data-plyr='fullscreen'] {
         display: none;
     }
-    &.captions-enabled [data-player='captions'],
-    &.captions-enabled [data-player='captions'] + label,
-    &.fullscreen-enabled [data-player='fullscreen'],
-    &.fullscreen-enabled [data-player='fullscreen'] + label {
+    &--captions-enabled [data-plyr='captions'],
+    &--fullscreen-enabled [data-plyr='fullscreen'] {
         display: inline-block;
     }
-}
+}

src/sprite/icon-captions-off.svg

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
-    <title>icon-captions-off</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" sketch:type="MSPage">
-        <path d="M1,2 C0.448,2 0,2.448 0,3 L0,15 C0,15.552 0.448,16 1,16 L17,16 C17.552,16 18,15.552 18,15 L18,3 C18,2.448 17.552,2 17,2 L1,2 Z M2,14 L2,4 L16,4 L16,14 L2,14 L2,14 Z" id="Shape" sketch:type="MSShapeGroup"></path>
+<svg viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <g>
+        <path d="M1,2 C0.448,2 0,2.448 0,3 L0,15 C0,15.552 0.448,16 1,16 L17,16 C17.552,16 18,15.552 18,15 L18,3 C18,2.448 17.552,2 17,2 L1,2 Z M2,14 L2,4 L16,4 L16,14 L2,14 L2,14 Z"></path>
     </g>
-</svg>
+</svg>

src/sprite/icon-captions-on.svg

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
-    <title>icon-captions-on</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" sketch:type="MSPage">
-        <path d="M1,2 C0.448,2 0,2.448 0,3 L0,15 C0,15.552 0.448,16 1,16 L17,16 C17.552,16 18,15.552 18,15 L18,3 C18,2.448 17.552,2 17,2 L1,2 Z M2,14 L2,4 L16,4 L16,14 L2,14 L2,14 Z" id="Shape" sketch:type="MSShapeGroup"></path>
-        <rect id="Rectangle-1" sketch:type="MSShapeGroup" x="3" y="11" width="3" height="2"></rect>
-        <rect id="Rectangle-3" sketch:type="MSShapeGroup" x="12" y="11" width="3" height="2"></rect>
-        <rect id="Rectangle-2" sketch:type="MSShapeGroup" x="7" y="11" width="4" height="2"></rect>
+<svg viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g>
+        <path d="M1,2 C0.448,2 0,2.448 0,3 L0,15 C0,15.552 0.448,16 1,16 L17,16 C17.552,16 18,15.552 18,15 L18,3 C18,2.448 17.552,2 17,2 L1,2 Z M2,14 L2,4 L16,4 L16,14 L2,14 L2,14 Z"></path>
+        <rect x="3" y="11" width="3" height="2"></rect>
+        <rect x="12" y="11" width="3" height="2"></rect>
+        <rect x="7" y="11" width="4" height="2"></rect>
     </g>
-</svg>
+</svg>

src/sprite/icon-enter-fullscreen.svg

@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
-    <title>expand</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" sketch:type="MSPage">
-        <g id="expand" sketch:type="MSLayerGroup" transform="translate(-1.000000, -1.000000)">
-            <path d="M7.00325,17.01 L7.00325,13.377 L8.29625,14.694 C8.68825,15.082 9.32125,15.082 9.71325,14.694 C10.10525,14.306 10.10425,13.678 9.71325,13.291 L6.74625,10.291 C6.55825,10.105 6.30425,10 6.03725,10 C6.02625,10 6.01425,10 6.00325,10.001 C5.99225,10.002 5.98025,10 5.96925,10 C5.70325,10 5.44825,10.105 5.26025,10.291 L2.29325,13.291 C1.90225,13.679 1.90225,14.307 2.29325,14.694 C2.68425,15.081 3.31825,15.082 3.71025,14.694 L5.00425,13.377 L5.00425,17.01 C5.00425,17.557 5.44725,18 5.99425,18 L6.01225,18 C6.55925,18 7.00225,17.557 7.00225,17.01 L7.00325,17.01 Z" id="Shape" sketch:type="MSShapeGroup" transform="translate(6.003438, 14.000000) rotate(-135.000000) translate(-6.003438, -14.000000) "></path>
-            <path d="M15.0066876,5.377 L16.2996876,6.694 C16.6916876,7.082 17.3246876,7.082 17.7166876,6.694 C18.1086876,6.306 18.1076876,5.678 17.7166876,5.291 L14.7496876,2.291 C14.5616876,2.105 14.3076876,2 14.0406876,2 C14.0296876,2 14.0176876,2 14.0066876,2.001 C13.9956876,2.002 13.9836876,2 13.9726876,2 C13.7066876,2 13.4516876,2.105 13.2636876,2.291 L10.2966876,5.291 C9.90568756,5.679 9.90568756,6.307 10.2966876,6.694 C10.6876876,7.081 11.3216876,7.082 11.7136876,6.694 L13.0076876,5.377 L13.0076876,9.01 C13.0076876,9.557 13.4506876,10 13.9976876,10 C14.5626876,10 15.0056876,9.557 15.0056876,9.01 L15.0066876,5.377 Z" id="Shape-2" sketch:type="MSShapeGroup" transform="translate(14.006875, 6.000000) rotate(45.000000) translate(-14.006875, -6.000000) "></path>
-        </g>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g transform="translate(9.000000, 9.000000) rotate(-180.000000) translate(-9.000000, -9.000000) translate(0.000000, 2.000000)">
+        <path d="M7.69999981,6.30000001 C7.00064659,5.62264405 6.3,6.3 6.3,6.3 L2,10.6 L2,6 L0,6 L0,13 C0,13.6 0.4,14 1,14 L8,14 L8,12 L3.4,12 L7.7,7.7 C7.7,7.7 8.39935303,6.97735597 7.69999981,6.30000001 Z"></path>
+        <path d="M11,14 L11,12 L16,12 L16,2 L2,2 L2,3 L0,3 L0,1 C0,0.4 0.4,0 1,0 L17,0 C17.6,0 18,0.4 18,1 L18,13 C18,13.6 17.6,14 17,14 L11,14 Z"></path>
     </g>
-</svg>
+</svg>

src/sprite/icon-exit-fullscreen.svg

@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
-    <title>collapse</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1">
-        <g id="collapse" sketch:type="MSLayerGroup" transform="translate(-1.000000, -1.000000)">
-            <path d="M15.00325,9.01 L15.00325,5.377 L16.29625,6.694 C16.68825,7.082 17.32125,7.082 17.71325,6.694 C18.10525,6.306 18.10425,5.678 17.71325,5.291 L14.74625,2.291 C14.55825,2.105 14.30425,2 14.03725,2 C14.02625,2 14.01425,2 14.00325,2.001 C13.99225,2.002 13.98025,2 13.96925,2 C13.70325,2 13.44825,2.105 13.26025,2.291 L10.29325,5.291 C9.90225,5.679 9.90225,6.307 10.29325,6.694 C10.68425,7.081 11.31825,7.082 11.71025,6.694 L13.00425,5.377 L13.00425,9.01 C13.00425,9.557 13.44725,10 13.99425,10 L14.01225,10 C14.55925,10 15.00225,9.557 15.00225,9.01 L15.00325,9.01 Z" id="Shape" sketch:type="MSShapeGroup" transform="translate(14.003438, 6.000000) rotate(-135.000000) translate(-14.003438, -6.000000) "></path>
-            <path d="M7.00668756,13.377 L8.29968756,14.694 C8.69168756,15.082 9.32468756,15.082 9.71668756,14.694 C10.1086876,14.306 10.1076876,13.678 9.71668756,13.291 L6.74968756,10.291 C6.56168756,10.105 6.30768756,10 6.04068756,10 C6.02968756,10 6.01768756,10 6.00668756,10.001 C5.99568756,10.002 5.98368756,10 5.97268756,10 C5.70668756,10 5.45168756,10.105 5.26368756,10.291 L2.29668756,13.291 C1.90568756,13.679 1.90568756,14.307 2.29668756,14.694 C2.68768756,15.081 3.32168756,15.082 3.71368756,14.694 L5.00768756,13.377 L5.00768756,17.01 C5.00768756,17.557 5.45068756,18 5.99768756,18 C6.56268756,18 7.00568756,17.557 7.00568756,17.01 L7.00668756,13.377 Z" id="Shape-2" sketch:type="MSShapeGroup" transform="translate(6.006875, 14.000000) rotate(45.000000) translate(-6.006875, -14.000000) "></path>
-        </g>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g transform="translate(0.000000, 2.000000)">
+        <path d="M7.69999981,6.30000001 C7.00064659,5.62264405 6.3,6.3 6.3,6.3 L2,10.6 L2,6 L0,6 L0,13 C0,13.6 0.4,14 1,14 L8,14 L8,12 L3.4,12 L7.7,7.7 C7.7,7.7 8.39935303,6.97735597 7.69999981,6.30000001 Z"></path>
+        <path d="M11,14 L11,12 L16,12 L16,2 L2,2 L2,3 L0,3 L0,1 C0,0.4 0.4,0 1,0 L17,0 C17.6,0 18,0.4 18,1 L18,13 C18,13.6 17.6,14 17,14 L11,14 Z"></path>
     </g>
-</svg>
+</svg>

src/sprite/icon-fast-forward.svg

@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by IcoMoon.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18" height="18" viewBox="0 0 18 18">
-<path d="M17.569 8.246l-10.569-6.246c-0.552 0-1 0.448-1 1v1.954l-5-2.954c-0.552 0-1 0.448-1 1v12c0 0.552 0.448 1 1 1l5-2.955v1.955c0 0.552 0.448 1 1 1l10.569-6.246c0.267-0.158 0.431-0.444 0.431-0.754s-0.164-0.597-0.431-0.754zM6 10.722l-4 2.364v-8.172l4 2.364v3.444zM8 13.086v-8.172l6.915 4.086-6.915 4.086z"></path>
+<svg viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<path d="M17.569 8.246l-10.569-6.246c-0.552 0-1 0.448-1 1v1.954l-5-2.954c-0.552 0-1 0.448-1 1v12c0 0.552 0.448 1 1 1l5-2.955v1.955c0 0.552 0.448 1 1 1l10.569-6.246c0.267-0.158 0.431-0.444 0.431-0.754s-0.164-0.597-0.431-0.754zM6 10.722l-4 2.364v-8.172l4 2.364v3.444zM8 13.086v-8.172l6.915 4.086-6.915 4.086z"></path>
 </svg>

src/sprite/icon-muted.svg

@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
-    <title>muted</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" sketch:type="MSPage">
-        <g id="sound" sketch:type="MSLayerGroup" transform="translate(0.000000, 2.000000)">
-            <path d="M9.214,0 C9.103,0 8.989,0.032 8.88,0.101 L4.832,2.911 C4.749,2.969 4.65,3 4.549,3 L0.996,3 C0.446,3 1.33226763e-15,3.448 1.33226763e-15,4 L1.33226763e-15,10 C1.33226763e-15,10.552 0.446,11 0.996,11 L4.549,11 C4.651,11 4.749,11.031 4.832,11.089 L8.88,13.899 C8.989,13.968 9.103,14 9.214,14 C9.606,14 9.961,13.6 9.961,13.051 L9.961,0.95 C9.961,0.4 9.606,0.001 9.214,0.001 L9.214,0 Z M7.969,10.834 L5.582,9.177 C5.416,9.062 5.218,8.999 5.016,8.999 L2.491,8.999 C2.216,8.999 1.993,8.775 1.993,8.499 L1.993,5.499 C1.993,5.223 2.216,4.999 2.491,4.999 L5.016,4.999 C5.218,4.999 5.416,4.937 5.582,4.821 L7.969,3.164 L7.969,10.833 L7.969,10.834 Z" id="Shape" sketch:type="MSShapeGroup"></path>
-            <path d="M14.934,6.799 C14.848,5.051 13.42,3.808 12.427,3.15 C11.957,2.838 11.333,3.028 11.102,3.558 L11.064,3.644 C10.876,4.075 11.019,4.583 11.4,4.838 C12.106,5.311 12.986,6.085 13.024,6.903 C13.056,7.579 12.471,8.371 11.361,9.173 C10.963,9.461 10.832,10.012 11.076,10.448 L11.118,10.523 C11.384,10.998 11.984,11.147 12.418,10.835 C14.158,9.584 15.004,8.229 14.934,6.798 L14.934,6.799 Z" id="Shape" sketch:type="MSShapeGroup"></path>
-            <path d="M17.934,6.799 C17.848,5.051 16.42,3.808 15.427,3.15 C14.957,2.838 14.333,3.028 14.102,3.558 L14.064,3.644 C13.876,4.075 14.019,4.583 14.4,4.838 C15.106,5.311 15.986,6.085 16.024,6.903 C16.056,7.579 15.471,8.371 14.361,9.173 C13.963,9.461 13.832,10.012 14.076,10.448 L14.118,10.523 C14.384,10.998 14.984,11.147 15.418,10.835 C17.158,9.584 18.004,8.229 17.934,6.798 L17.934,6.799 Z" id="Shape-2" sketch:type="MSShapeGroup" transform="translate(15.945467, 6.999165) rotate(-180.000000) translate(-15.945467, -6.999165) "></path>
-        </g>
+<svg viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g transform="translate(0.000000, 2.000000)">
+        <path d="M9.214,0 C9.103,0 8.989,0.032 8.88,0.101 L4.832,2.911 C4.749,2.969 4.65,3 4.549,3 L0.996,3 C0.446,3 1.33226763e-15,3.448 1.33226763e-15,4 L1.33226763e-15,10 C1.33226763e-15,10.552 0.446,11 0.996,11 L4.549,11 C4.651,11 4.749,11.031 4.832,11.089 L8.88,13.899 C8.989,13.968 9.103,14 9.214,14 C9.606,14 9.961,13.6 9.961,13.051 L9.961,0.95 C9.961,0.4 9.606,0.001 9.214,0.001 L9.214,0 Z M7.969,10.834 L5.582,9.177 C5.416,9.062 5.218,8.999 5.016,8.999 L2.491,8.999 C2.216,8.999 1.993,8.775 1.993,8.499 L1.993,5.499 C1.993,5.223 2.216,4.999 2.491,4.999 L5.016,4.999 C5.218,4.999 5.416,4.937 5.582,4.821 L7.969,3.164 L7.969,10.833 L7.969,10.834 Z"></path>
+        <path d="M14.934,6.799 C14.848,5.051 13.42,3.808 12.427,3.15 C11.957,2.838 11.333,3.028 11.102,3.558 L11.064,3.644 C10.876,4.075 11.019,4.583 11.4,4.838 C12.106,5.311 12.986,6.085 13.024,6.903 C13.056,7.579 12.471,8.371 11.361,9.173 C10.963,9.461 10.832,10.012 11.076,10.448 L11.118,10.523 C11.384,10.998 11.984,11.147 12.418,10.835 C14.158,9.584 15.004,8.229 14.934,6.798 L14.934,6.799 Z"></path>
+        <path d="M17.934,6.799 C17.848,5.051 16.42,3.808 15.427,3.15 C14.957,2.838 14.333,3.028 14.102,3.558 L14.064,3.644 C13.876,4.075 14.019,4.583 14.4,4.838 C15.106,5.311 15.986,6.085 16.024,6.903 C16.056,7.579 15.471,8.371 14.361,9.173 C13.963,9.461 13.832,10.012 14.076,10.448 L14.118,10.523 C14.384,10.998 14.984,11.147 15.418,10.835 C17.158,9.584 18.004,8.229 17.934,6.798 L17.934,6.799 Z" transform="translate(15.945467, 6.999165) rotate(-180.000000) translate(-15.945467, -6.999165) "></path>
     </g>
-</svg>
+</svg>

src/sprite/icon-pause.svg

@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
-    <title>pause</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" sketch:type="MSPage">
-        <g id="pause" sketch:type="MSLayerGroup" transform="translate(2.000000, 2.000000)">
-            <path d="M0,2 L0,12 C5.24848613e-17,14 2,14 2,14 L4,14 C4,14 6,14 6,12 C6,11.786438 6,11.572876 6,11 L6,2 C6,3.17446247e-09 4,0 4,0 L2,0 C2,0 0,0 0,2 Z M2,2 L4,2 L4,12 L2,12 L2,2 Z" id="Path-1" sketch:type="MSShapeGroup"></path>
-            <path d="M8,2 L8,12 C8,14 10,14 10,14 L12,14 C12,14 14,14 14,12 C14,11.786438 14,11.572876 14,11 L14,2 C14,3.17446247e-09 12,0 12,0 L10,0 C10,0 8,0 8,2 Z M10,2 L12,2 L12,12 L10,12 L10,2 Z" id="Path-2" sketch:type="MSShapeGroup"></path>
-        </g>
+<svg viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g transform="translate(2.000000, 2.000000)">
+        <path d="M0,2 L0,12 C5.24848613e-17,14 2,14 2,14 L4,14 C4,14 6,14 6,12 C6,11.786438 6,11.572876 6,11 L6,2 C6,3.17446247e-09 4,0 4,0 L2,0 C2,0 0,0 0,2 Z M2,2 L4,2 L4,12 L2,12 L2,2 Z"></path>
+        <path d="M8,2 L8,12 C8,14 10,14 10,14 L12,14 C12,14 14,14 14,12 C14,11.786438 14,11.572876 14,11 L14,2 C14,3.17446247e-09 12,0 12,0 L10,0 C10,0 8,0 8,2 Z M10,2 L12,2 L12,12 L10,12 L10,2 Z"></path>
     </g>
-</svg>
+</svg>

src/sprite/icon-play.svg

@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by IcoMoon.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18" height="18" viewBox="0 0 18 18">
-<path d="M5 4.914l6.915 4.086-6.915 4.086v-8.172zM4 2c-0.552 0-1 0.448-1 1v12c0 0.552 0.448 1 1 1l10.569-6.246c0.267-0.158 0.431-0.444 0.431-0.754s-0.164-0.597-0.431-0.754l-10.569-6.246z"></path>
+<svg viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<path d="M5 4.914l6.915 4.086-6.915 4.086v-8.172zM4 2c-0.552 0-1 0.448-1 1v12c0 0.552 0.448 1 1 1l10.569-6.246c0.267-0.158 0.431-0.444 0.431-0.754s-0.164-0.597-0.431-0.754l-10.569-6.246z"></path>
 </svg>

src/sprite/icon-restart.svg

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
-    <title>icon-restart</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" sketch:type="MSPage">
-        <path d="M17,2 C16.448,2 16,2.448 16,3 L16,7.318 L7,2 C6.448,2 6,2.448 6,3 L6,4.954 L1,2 C0.448,2 0,2.448 0,3 L0,15 C0,15.552 0.448,16 1,16 L6,13.045 L6,15 C6,15.552 6.448,16 7,16 L16,10.682 L16,15 C16,15.552 16.448,16 17,16 C17.552,16 18,15.552 18,15 L18,3 C18,2.448 17.552,2 17,2 L17,2 Z M6,10.722 L2,13.086 L2,4.914 L6,7.278 L6,10.722 L6,10.722 Z M8,13.086 L8,4.914 L14.915,9 L8,13.086 L8,13.086 Z" id="Shape" sketch:type="MSShapeGroup" transform="translate(9.000000, 9.000000) scale(-1, 1) translate(-9.000000, -9.000000) "></path>
-    </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<path d="M7.7,1.2l0.7,6.4l2.1-2.1c1.9,1.9,1.9,5.1,0,7C9.6,13.5,8.3,14,7,14c-1.3,0-2.6-0.5-3.5-1.5
+	c-1.9-1.9-1.9-5.1,0-7c0.6-0.6,1.4-1.1,2.3-1.3L5.2,2.3C4,2.6,2.9,3.2,2,4.1c-2.7,2.7-2.7,7.1,0,9.9c1.3,1.3,3.1,2,4.9,2
+	c1.9,0,3.6-0.7,4.9-2c2.7-2.7,2.7-7.1,0-9.9l2.2-2.2L7.7,1.2z"/>
+</svg>

src/sprite/icon-rewind.svg

@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="18px" height="21px" viewBox="0 0 18 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
-    <title>rewind</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" sketch:type="MSPage">
-        <path d="M17.569,9.246 L7,3 C6.448,3 6,3.448 6,4 L6,5.954 L1,3 C0.448,3 0,3.448 0,4 L0,16 C0,16.552 0.448,17 1,17 L6,14.045 L6,16 C6,16.552 6.448,17 7,17 L17.569,10.754 C17.836,10.596 18,10.31 18,10 C18,9.69 17.836,9.403 17.569,9.246 L17.569,9.246 Z M6,11.722 L2,14.086 L2,5.914 L6,8.278 L6,11.722 L6,11.722 Z M8,14.086 L8,5.914 L14.915,10 L8,14.086 L8,14.086 Z" id="Shape" sketch:type="MSShapeGroup" transform="translate(9.000000, 10.000000) rotate(-180.000000) translate(-9.000000, -10.000000) "></path>
-    </g>
-</svg>
+<svg viewBox="0 0 18 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+	<path d="M17.569,9.246 L7,3 C6.448,3 6,3.448 6,4 L6,5.954 L1,3 C0.448,3 0,3.448 0,4 L0,16 C0,16.552 0.448,17 1,17 L6,14.045 L6,16 C6,16.552 6.448,17 7,17 L17.569,10.754 C17.836,10.596 18,10.31 18,10 C18,9.69 17.836,9.403 17.569,9.246 L17.569,9.246 Z M6,11.722 L2,14.086 L2,5.914 L6,8.278 L6,11.722 L6,11.722 Z M8,14.086 L8,5.914 L14.915,10 L8,14.086 L8,14.086 Z" transform="translate(9.000000, 10.000000) rotate(-180.000000) translate(-9.000000, -10.000000) "></path>
+</svg>

src/sprite/icon-volume.svg

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by IcoMoon.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18" height="18" viewBox="0 0 18 18">
-<path d="M10.214 2c-0.111 0-0.225 0.032-0.334 0.101l-4.048 2.81c-0.083 0.058-0.182 0.089-0.283 0.089h-3.553c-0.55 0-0.996 0.448-0.996 1v6c0 0.552 0.446 1 0.996 1h3.553c0.102 0 0.2 0.031 0.283 0.089l4.048 2.81c0.109 0.069 0.223 0.101 0.334 0.101 0.392 0 0.747-0.4 0.747-0.949v-12.101c0-0.55-0.355-0.949-0.747-0.949zM8.969 12.834l-2.387-1.657c-0.166-0.115-0.364-0.178-0.566-0.178h-2.525c-0.275 0-0.498-0.224-0.498-0.5v-3c0-0.276 0.223-0.5 0.498-0.5h2.525c0.202 0 0.4-0.062 0.566-0.178l2.387-1.657v7.669z"></path>
-<path d="M16.934 8.799c-0.086-1.748-1.514-2.991-2.507-3.649-0.47-0.312-1.094-0.122-1.325 0.408l-0.038 0.086c-0.188 0.431-0.045 0.939 0.336 1.194 0.706 0.473 1.586 1.247 1.624 2.065 0.032 0.676-0.553 1.468-1.663 2.27-0.398 0.288-0.529 0.839-0.285 1.275l0.042 0.075c0.266 0.475 0.866 0.624 1.3 0.312 1.74-1.251 2.586-2.606 2.516-4.037z"></path>
+<svg viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<path d="M10.214 2c-0.111 0-0.225 0.032-0.334 0.101l-4.048 2.81c-0.083 0.058-0.182 0.089-0.283 0.089h-3.553c-0.55 0-0.996 0.448-0.996 1v6c0 0.552 0.446 1 0.996 1h3.553c0.102 0 0.2 0.031 0.283 0.089l4.048 2.81c0.109 0.069 0.223 0.101 0.334 0.101 0.392 0 0.747-0.4 0.747-0.949v-12.101c0-0.55-0.355-0.949-0.747-0.949zM8.969 12.834l-2.387-1.657c-0.166-0.115-0.364-0.178-0.566-0.178h-2.525c-0.275 0-0.498-0.224-0.498-0.5v-3c0-0.276 0.223-0.5 0.498-0.5h2.525c0.202 0 0.4-0.062 0.566-0.178l2.387-1.657v7.669z"></path>
+	<path d="M16.934 8.799c-0.086-1.748-1.514-2.991-2.507-3.649-0.47-0.312-1.094-0.122-1.325 0.408l-0.038 0.086c-0.188 0.431-0.045 0.939 0.336 1.194 0.706 0.473 1.586 1.247 1.624 2.065 0.032 0.676-0.553 1.468-1.663 2.27-0.398 0.288-0.529 0.839-0.285 1.275l0.042 0.075c0.266 0.475 0.866 0.624 1.3 0.312 1.74-1.251 2.586-2.606 2.516-4.037z"></path>
 </svg>