Merge branch 'master' into develop

# Conflicts: # dist/plyr.css # src/less/plyr.less
2016-05-10 10:01:29 +10:00
parent 3f20462943 4d67d68c6b
commit d351f9f172
3 changed files with 5 additions and 1 deletions
--- a/dist/plyr.css
+++ b/dist/plyr.css
--- a/src/less/components.less
+++ b/src/less/components.less
@ -143,6 +143,9 @@
 // --------------------------------------------------------------
 .plyr__progress {
    position: relative;
+    // For IE10
+    // http://stackoverflow.com/questions/22008135/internet-explorer-10-does-not-apply-flexbox-on-inline-elements
+    display: inline-block;
    flex: 1;

    input[type="range"] {
--- a/src/scss/plyr.scss
+++ b/src/scss/plyr.scss
@ -474,6 +474,7 @@
 // <progress> element
 .plyr__progress {
    position: relative;
+    display: inline-block;
    flex: 1;

    input[type="range"] {