plyr.git - A fork of plyr without nonfree parts

	Commit message (Collapse)	Author	Age	Files	Lines
*	More work on custom properties and documentation	Sam Potts	2020-04-24	1	-15/+15
\|
*	Converted to 2 space indentation	Sam Potts	2020-04-11	1	-39/+37
\|
*	Merge branch 'develop' into css-variables	Sam Potts	2020-03-30	1	-2/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# 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
* \|	More work on variable usage	Sam Potts	2019-04-11	1	-1/+0
\| \|
* \|	Merge branch 'develop' into css-variables	Sam Potts	2018-11-11	1	-4/+5
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # demo/dist/demo.css # demo/dist/demo.js # demo/dist/demo.js.map # demo/dist/demo.min.js # demo/dist/demo.min.js.map # dist/plyr.css # dist/plyr.js # dist/plyr.js.map # dist/plyr.min.js # dist/plyr.min.js.map # dist/plyr.polyfilled.js # dist/plyr.polyfilled.js.map # dist/plyr.polyfilled.min.js # dist/plyr.polyfilled.min.js.map # gulpfile.js # src/sass/components/captions.scss # src/sass/components/control.scss
\| *	Fix #1137: Improve captions positioning consistency	Albin Larsson	2018-07-31	1	-3/+4
\| \|
\| *	Fix #1003: Formatted captions issue	Albin Larsson	2018-06-10	1	-1/+1
\| \|
* \|	WIP	Sam Potts	2018-05-26	1	-2/+2
\|/
*	Converted to SASS/SCSS	Sam Potts	2017-12-20	1	-0/+58