diff options
| author | Sam Potts <sam@potts.es> | 2018-11-11 11:05:09 +1100 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-11-11 11:05:09 +1100 |
| commit | b7b2e3c0aa0749eed53ae91230082cb0482e1f28 (patch) | |
| tree | f073bde14df6459419323dd6570b2549b8d26c41 /demo/src/sass | |
| parent | 3e0a91141822758094b2cbd5f0ecdd8ce4142b5f (diff) | |
| parent | 2c8a337f265f3f84133bc674f3836802588c0c13 (diff) | |
| download | plyr-b7b2e3c0aa0749eed53ae91230082cb0482e1f28.tar.lz plyr-b7b2e3c0aa0749eed53ae91230082cb0482e1f28.tar.xz plyr-b7b2e3c0aa0749eed53ae91230082cb0482e1f28.zip | |
Merge branch 'develop' into css-variables
# 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
Diffstat (limited to 'demo/src/sass')
| -rw-r--r-- | demo/src/sass/lib/fontface.scss | 9 | ||||
| -rw-r--r-- | demo/src/sass/settings/plyr.scss | 3 | ||||
| -rw-r--r-- | demo/src/sass/settings/type.scss | 3 |
3 files changed, 11 insertions, 4 deletions
diff --git a/demo/src/sass/lib/fontface.scss b/demo/src/sass/lib/fontface.scss index e7e4edf8..d104c501 100644 --- a/demo/src/sass/lib/fontface.scss +++ b/demo/src/sass/lib/fontface.scss @@ -7,7 +7,8 @@ font-family: 'Gordita'; font-style: normal; font-weight: $font-weight-light; - src: url('https://cdn.plyr.io/static/fonts/gordita-light.woff2') format('woff2'), url('https://cdn.plyr.io/static/fonts/gordita-light.woff') format('woff'); + src: url('https://cdn.plyr.io/static/fonts/gordita-light.woff2') format('woff2'), + url('https://cdn.plyr.io/static/fonts/gordita-light.woff') format('woff'); } @font-face { @@ -33,7 +34,8 @@ font-family: 'Gordita'; font-style: normal; font-weight: $font-weight-bold; - src: url('https://cdn.plyr.io/static/fonts/gordita-bold.woff2') format('woff2'), url('https://cdn.plyr.io/static/fonts/gordita-bold.woff') format('woff'); + src: url('https://cdn.plyr.io/static/fonts/gordita-bold.woff2') format('woff2'), + url('https://cdn.plyr.io/static/fonts/gordita-bold.woff') format('woff'); } @font-face { @@ -41,5 +43,6 @@ font-family: 'Gordita'; font-style: normal; font-weight: $font-weight-black; - src: url('https://cdn.plyr.io/static/fonts/gordita-black.woff2') format('woff2'), url('https://cdn.plyr.io/static/fonts/gordita-black.woff') format('woff'); + src: url('https://cdn.plyr.io/static/fonts/gordita-black.woff2') format('woff2'), + url('https://cdn.plyr.io/static/fonts/gordita-black.woff') format('woff'); } diff --git a/demo/src/sass/settings/plyr.scss b/demo/src/sass/settings/plyr.scss index 44f89bb2..ae6be636 100644 --- a/demo/src/sass/settings/plyr.scss +++ b/demo/src/sass/settings/plyr.scss @@ -11,6 +11,9 @@ $plyr-font-size-small: 12px; $plyr-font-size-time: 11px; $plyr-font-size-badges: 9px; +// Other +$plyr-font-smoothing: true; + // Captions $plyr-font-size-captions-base: $plyr-font-size-base; $plyr-font-size-captions-small: $plyr-font-size-small; diff --git a/demo/src/sass/settings/type.scss b/demo/src/sass/settings/type.scss index e8f0b2c8..8c614361 100644 --- a/demo/src/sass/settings/type.scss +++ b/demo/src/sass/settings/type.scss @@ -2,7 +2,8 @@ // Typography // ========================================================================== -$font-sans-serif: 'Gordita', 'Avenir', 'Helvetica Neue', sans-serif; +$font-sans-serif: 'Gordita', 'Avenir', 'Helvetica Neue', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', + 'Segoe UI Symbol'; $font-size-base: 15; $font-size-small: 13; |