diff options
| author | Sam Potts <sam@potts.es> | 2020-04-24 00:22:17 +1000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2020-04-24 00:22:17 +1000 |
| commit | 2458eaa11b5c2805bcf1e5349ab900485bac325f (patch) | |
| tree | 8c38683d043fdfbe8b1dcb385a446de4df7396a1 /demo/src | |
| parent | a97008aeebb19678e5183e7c934e60729857e11b (diff) | |
| parent | dbe618c644a525b196466b7254274cc9bde76275 (diff) | |
| download | plyr-2458eaa11b5c2805bcf1e5349ab900485bac325f.tar.lz plyr-2458eaa11b5c2805bcf1e5349ab900485bac325f.tar.xz plyr-2458eaa11b5c2805bcf1e5349ab900485bac325f.zip | |
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
Diffstat (limited to 'demo/src')
| -rw-r--r-- | demo/src/sass/settings/plyr.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demo/src/sass/settings/plyr.scss b/demo/src/sass/settings/plyr.scss index 67bde8d3..05190709 100644 --- a/demo/src/sass/settings/plyr.scss +++ b/demo/src/sass/settings/plyr.scss @@ -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, ) ); |