Merge branch 'master' into develop

# Conflicts: # dist/plyr.css # src/less/plyr.less
2016-05-11 22:47:27 +10:00
parent d351f9f172 31c933af38
commit 4a69ef3874
9 changed files with 78 additions and 38 deletions
@@ -8,18 +8,22 @@
    min-width: 200px;
    font-family: Avenir, "Avenir Next", "Helvetica Neue", "Segoe UI", Helvetica, Arial, sans-serif;

-    // border-box everything
-    // http://paulirish.com/2012/box-sizing-border-box-ftw/
-    &,
-    *,
-    *::after,
-    *::before {
-        box-sizing: border-box;
+    & when (@plyr-border-box = true) {
+        // border-box everything
+        // http://paulirish.com/2012/box-sizing-border-box-ftw/
+        &,
+        *,
+        *::after,
+        *::before {
+            box-sizing: border-box;
+        }
    }

-    // Fix 300ms delay
-    a, button, input, label {
-        touch-action: manipulation;
+    & when (@plyr-touch-action = true) {
+        // Fix 300ms delay
+        a, button, input, label {
+            touch-action: manipulation;
+        }
    }

    // Media elements