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
This commit is contained in:
Sam Potts
2020-04-24 00:22:17 +10:00
8 changed files with 61 additions and 10 deletions

View File

@ -13,6 +13,6 @@
--plyr-font-weight-regular: 500,
--plyr-font-weight-bold: 600,
--plyr-font-size-captions-medium: 18px,
--plyr-font-size-captions-large: 21px
--plyr-font-size-captions-large: 21px,
)
);