aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSam Potts <me@sampotts.me>2015-03-06 12:21:51 +1100
committerSam Potts <me@sampotts.me>2015-03-06 12:21:51 +1100
commitc48afb7880b240e2a2b22fb75051292792b4b06f (patch)
treecda74b195ba66bd61af6974333dff02501138c67 /src
parent5d3fb359b8dfaa9db9fe70131055fe04d4ab66df (diff)
parentb9915b4b94783aa6841821ad76918995900bf72d (diff)
downloadplyr-c48afb7880b240e2a2b22fb75051292792b4b06f.tar.lz
plyr-c48afb7880b240e2a2b22fb75051292792b4b06f.tar.xz
plyr-c48afb7880b240e2a2b22fb75051292792b4b06f.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'src')
-rw-r--r--src/js/plyr.js2
-rw-r--r--src/less/plyr.less2
-rw-r--r--src/sass/plyr.scss2
3 files changed, 1 insertions, 5 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js
index a8434ca4..a193f5d8 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
-// plyr.js v1.0.20
+// plyr.js v1.0.21
// https://github.com/sampotts/plyr
// License: The MIT License (MIT)
// ==========================================================================
diff --git a/src/less/plyr.less b/src/less/plyr.less
index b72f0ec7..410404be 100644
--- a/src/less/plyr.less
+++ b/src/less/plyr.less
@@ -284,11 +284,9 @@
// Inherit from currentColor;
&::-webkit-progress-value {
background: currentColor;
- transition: width .1s ease;
}
&::-moz-progress-bar {
background: currentColor;
- transition: width .1s ease;
}
}
&-played[value] {
diff --git a/src/sass/plyr.scss b/src/sass/plyr.scss
index 34ab288f..d7045b41 100644
--- a/src/sass/plyr.scss
+++ b/src/sass/plyr.scss
@@ -289,11 +289,9 @@ $bp-captions-large: 768px; // When captions jump to the larger font size
// Inherit from currentColor;
&::-webkit-progress-value {
background: currentColor;
- transition: width .1s ease;
}
&::-moz-progress-bar {
background: currentColor;
- transition: width .1s ease;
}
}
&-played[value] {