diff options
| author | Sam Potts <sam@potts.es> | 2019-01-29 21:34:40 +1100 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2019-01-29 21:34:40 +1100 |
| commit | b1da599b5d5891dc1dca44bd6aa9d8d03872fdcb (patch) | |
| tree | c799fb2b444482f6d99dcdf3f16a957b290888c0 /demo/src/sass | |
| parent | afc969bac322f9b17dc0554a65fa848eb998c8e6 (diff) | |
| parent | b798368ba68853558819d79a995aa0deec27f95e (diff) | |
| download | plyr-b1da599b5d5891dc1dca44bd6aa9d8d03872fdcb.tar.lz plyr-b1da599b5d5891dc1dca44bd6aa9d8d03872fdcb.tar.xz plyr-b1da599b5d5891dc1dca44bd6aa9d8d03872fdcb.zip | |
Merge branch 'develop' into beta
Diffstat (limited to 'demo/src/sass')
| -rw-r--r-- | demo/src/sass/lib/fontface.scss | 9 | ||||
| -rw-r--r-- | demo/src/sass/settings/layout.scss | 2 | ||||
| -rw-r--r-- | demo/src/sass/settings/plyr.scss | 3 | ||||
| -rw-r--r-- | demo/src/sass/settings/type.scss | 3 |
4 files changed, 12 insertions, 5 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/layout.scss b/demo/src/sass/settings/layout.scss index 8d1fbd28..77185344 100644 --- a/demo/src/sass/settings/layout.scss +++ b/demo/src/sass/settings/layout.scss @@ -2,4 +2,4 @@ // Layout // ========================================================================== -$container-max-width: 1280px; +$container-max-width: 1260px; 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; |