Commit Graph

14 Commits

Author SHA1 Message Date
Sam Potts 2458eaa11b Merge branch 'develop' into css-variables
# Conflicts:
#	src/js/captions.js
#	src/js/config/defaults.js
#	src/js/fullscreen.js
#	src/js/listeners.js
#	src/js/plyr.js
2020-04-24 00:22:17 +10:00
Sam Potts a9b24f5e1f Use custom properties in demo 2020-04-23 22:07:32 +10:00
Sam Potts 502d5977d7 Converted to 2 space indentation 2020-04-11 16:23:14 +10:00
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
Sam Potts 2e40b91ec1 Styling tweaks for demo 2019-06-20 23:50:46 +10:00
Sam Potts d9d2c4a219 Demo tweaks 2019-06-03 00:26:08 +10:00
Sam Potts ac88e6e190 Demo clean up 2019-06-02 23:16:29 +10:00
Sam Potts e2fc20ca76 Styling tweaks 2018-11-08 23:18:04 +11:00
Sam Potts 1f1d74ba50 Work on menus 2018-06-21 09:01:16 +10:00
Sam Potts c06e0ee5e9 Grid tweak 2018-05-09 09:48:46 +10:00
Sam Potts e4d975af00 Styling fixes 2018-04-03 22:56:19 +10:00
Sam Potts 73a39769d4 Fullscreen API changes, color settings tweaks 2018-02-11 15:09:34 +11:00
Sam Potts a0d9d5eca8 Styling tweaks 2018-01-09 09:14:59 +11:00
Sam Potts 6864149989 Converted to SASS/SCSS 2017-12-20 15:14:05 +00:00