diff options
| author | Danielh112 <Daniel@sbgsportssoftware.com> | 2020-08-18 11:29:25 +0100 |
|---|---|---|
| committer | Danielh112 <Daniel@sbgsportssoftware.com> | 2020-08-18 11:29:25 +0100 |
| commit | f7e9ee56d2ed5447f59e5548f005fabdab2f0a72 (patch) | |
| tree | a16300fa62e68b3310ae96e36dba65981f0024ef /demo/src/sass/lib/fontface.scss | |
| parent | 22af7f16ea4a4269321d29242d63ec23718c92da (diff) | |
| parent | 423b7b276f1572eb666de32094a9aacd32e87d18 (diff) | |
| download | plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.tar.lz plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.tar.xz plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.zip | |
Fix merge conflicts
Diffstat (limited to 'demo/src/sass/lib/fontface.scss')
| -rw-r--r-- | demo/src/sass/lib/fontface.scss | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/demo/src/sass/lib/fontface.scss b/demo/src/sass/lib/fontface.scss index d104c501..d54188d0 100644 --- a/demo/src/sass/lib/fontface.scss +++ b/demo/src/sass/lib/fontface.scss @@ -3,46 +3,46 @@ // ========================================================================== @font-face { - font-display: swap; - 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'); + font-display: swap; + 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'); } @font-face { - font-display: swap; - font-family: 'Gordita'; - font-style: normal; - font-weight: $font-weight-regular; - src: url('https://cdn.plyr.io/static/fonts/gordita-regular.woff2') format('woff2'), - url('https://cdn.plyr.io/static/fonts/gordita-regular.woff') format('woff'); + font-display: swap; + font-family: 'Gordita'; + font-style: normal; + font-weight: $font-weight-regular; + src: url('https://cdn.plyr.io/static/fonts/gordita-regular.woff2') format('woff2'), + url('https://cdn.plyr.io/static/fonts/gordita-regular.woff') format('woff'); } @font-face { - font-display: swap; - font-family: 'Gordita'; - font-style: normal; - font-weight: $font-weight-medium; - src: url('https://cdn.plyr.io/static/fonts/gordita-medium.woff2') format('woff2'), - url('https://cdn.plyr.io/static/fonts/gordita-medium.woff') format('woff'); + font-display: swap; + font-family: 'Gordita'; + font-style: normal; + font-weight: $font-weight-medium; + src: url('https://cdn.plyr.io/static/fonts/gordita-medium.woff2') format('woff2'), + url('https://cdn.plyr.io/static/fonts/gordita-medium.woff') format('woff'); } @font-face { - font-display: swap; - 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'); + font-display: swap; + 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'); } @font-face { - font-display: swap; - 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'); + font-display: swap; + 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'); } |