Sam Potts da943b384c Merge branch 'develop' into css-variables ...

# Conflicts:
#	demo/dist/demo.css
#	demo/dist/demo.min.js.map
#	demo/index.html
#	dist/plyr.css
#	dist/plyr.min.js.map
#	dist/plyr.min.mjs.map
#	dist/plyr.polyfilled.min.js.map
#	dist/plyr.polyfilled.min.mjs.map
#	gulpfile.js
#	src/sass/base.scss
#	src/sass/components/control.scss
#	src/sass/settings/colors.scss
#	src/sass/settings/controls.scss

2020-03-30 10:45:57 +11:00

..

animation.scss

Converted to SASS/SCSS

2017-12-20 15:14:05 +00:00

css-vars.scss

Merge branch 'develop' into css-variables

2020-03-30 10:45:57 +11:00

functions.scss

Vimeo fix

2017-12-21 00:20:56 +00:00

mixins.scss

Merge branch 'develop' into css-variables

2020-03-30 10:45:57 +11:00