From b39961ec49f6fc62e3807bb3b41e7e3c369eb26a Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Mon, 20 Jul 2015 22:28:27 +1000 Subject: [PATCH] Tidying --- docs/index.youtube.html | 68 ----------------------------------------- package.json | 2 +- src/js/plyr.js | 2 +- src/less/plyr.less | 3 +- src/sass/plyr.scss | 18 ++++++----- 5 files changed, 14 insertions(+), 79 deletions(-) delete mode 100644 docs/index.youtube.html diff --git a/docs/index.youtube.html b/docs/index.youtube.html deleted file mode 100644 index c234bae8..00000000 --- a/docs/index.youtube.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - Plyr - A simple HTML5 media player - - - - - - - - - - - -
-

Plyr

-

A simple HTML5 media player with custom controls and WebVTT captions by @sam_potts

- -
- -
-
-
-
-
-
-
- - - - - - - - - - - - - \ No newline at end of file diff --git a/package.json b/package.json index 91096dcd..daf34eaf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "plyr", - "version": "1.1.14", + "version": "1.2.0", "description": "A simple HTML5 media player using custom controls", "homepage": "http://plyr.io", "main": "gulpfile.js", diff --git a/src/js/plyr.js b/src/js/plyr.js index 232c49a8..8f3f7573 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v1.1.14 +// plyr.js v1.2.0 // https://github.com/selz/plyr // License: The MIT License (MIT) // ========================================================================== diff --git a/src/less/plyr.less b/src/less/plyr.less index 75d94b0f..ecc37e37 100644 --- a/src/less/plyr.less +++ b/src/less/plyr.less @@ -1,5 +1,6 @@ // ========================================================================== -// HTML5 Media Player +// Plyr styles +// https://github.com/selz/plyr // ========================================================================== // Variables diff --git a/src/sass/plyr.scss b/src/sass/plyr.scss index 011a5368..767dc501 100644 --- a/src/sass/plyr.scss +++ b/src/sass/plyr.scss @@ -1,5 +1,6 @@ // ========================================================================== -// HTML5 Media Player +// Plyr styles +// https://github.com/selz/plyr // ========================================================================== // Variables @@ -51,6 +52,13 @@ $volume-thumb-bg-focus: $control-bg-hover !default; $bp-control-split: 560px !default; // When controls split into left/right $bp-captions-large: 768px !default; // When captions jump to the larger font size +// Animation +// --------------------------------------- + +@keyframes progress { + to { background-position: $progress-loading-size 0; } +} + // Mixins // ------------------------------- @@ -100,13 +108,7 @@ $bp-captions-large: 768px !default; // When captions jump to the larger fo outline-offset: 0; } -// Animation -// --------------------------------------- -@keyframes progress { - to { background-position: $progress-loading-size 0; } -} - -// styling +// Range mixins @mixin volume-thumb() { height: $volume-thumb-height;