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

..

badges.scss

Merge branch 'develop' into css-variables

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

captions.scss

Merge branch 'develop' into css-variables

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

control.scss

Merge branch 'develop' into css-variables

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

controls.scss

SASS orginasation clean up and flex-direction added

2020-02-10 11:23:57 +00:00

menus.scss

Merge branch 'develop' into css-variables

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

poster.scss

Fix for hover over iframed players not showing controls

2018-08-02 00:47:03 +10:00

progress.scss

Merge branch 'develop' into css-variables

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

sliders.scss

Merge branch 'develop' into css-variables

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

times.scss

SASS orginasation clean up and flex-direction added

2020-02-10 11:23:57 +00:00

tooltips.scss

Merge branch 'develop' into css-variables

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

volume.scss

v3.5.10

2020-02-14 17:33:09 +00:00