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
--- a/src/less/variables.less
+++ b/src/less/variables.less
@ -2,6 +2,11 @@
 // Variables
 // ==========================================================================

+// Settings
+@plyr-border-box:                       true;
+@plyr-touch-action:                     true;
+@plyr-sr-only-important:                true;
+
 // Colors
@plyr-color-main:                       #3498db;