diff options
| author | Sam Potts <me@sampotts.me> | 2017-11-18 19:33:01 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2017-11-18 19:33:01 +1100 |
| commit | 5a244b7fedf185842b04f817eb07f49ae589d4a6 (patch) | |
| tree | 86bcff6d5b6f9843df0d4f1ad3da926569066662 /demo/src/less/lib | |
| parent | 4dca4bf93c5cfcb8adb40b78528867de271b8361 (diff) | |
| parent | 6984d6fb1606a71edd35ac043ac1116b6de8e98b (diff) | |
| download | plyr-5a244b7fedf185842b04f817eb07f49ae589d4a6.tar.lz plyr-5a244b7fedf185842b04f817eb07f49ae589d4a6.tar.xz plyr-5a244b7fedf185842b04f817eb07f49ae589d4a6.zip | |
Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
# dist/plyr.js
# dist/plyr.js.map
# src/js/controls.js
Diffstat (limited to 'demo/src/less/lib')
| -rw-r--r-- | demo/src/less/lib/fontface.less | 6 | ||||
| -rw-r--r-- | demo/src/less/lib/mixins.less | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/demo/src/less/lib/fontface.less b/demo/src/less/lib/fontface.less index c6720210..2ae6e8f4 100644 --- a/demo/src/less/lib/fontface.less +++ b/demo/src/less/lib/fontface.less @@ -4,7 +4,7 @@ @font-face { font-family: 'Avenir'; - src: url('https://cdn.plyr.io/static/fonts/avenir-medium.woff2') format('woff2'), + src: local('Avenir-Medium'), url('https://cdn.plyr.io/static/fonts/avenir-medium.woff2') format('woff2'), url('https://cdn.plyr.io/static/fonts/avenir-medium.woff') format('woff'); font-style: normal; font-weight: @font-weight-base; @@ -13,7 +13,7 @@ @font-face { font-family: 'Avenir'; - src: url('https://cdn.plyr.io/static/fonts/avenir-bold.woff2') format('woff2'), + src: local('Avenir-Heavy'), url('https://cdn.plyr.io/static/fonts/avenir-bold.woff2') format('woff2'), url('https://cdn.plyr.io/static/fonts/avenir-bold.woff') format('woff'); font-style: normal; font-weight: @font-weight-bold; @@ -22,7 +22,7 @@ @font-face { font-family: 'Avenir'; - src: url('https://cdn.plyr.io/static/fonts/avenir-black.woff2?v=3') format('woff2'), + src: local('Avenir-Black'), url('https://cdn.plyr.io/static/fonts/avenir-black.woff2?v=3') format('woff2'), url('https://cdn.plyr.io/static/fonts/avenir-black.woff?v=3') format('woff'); font-style: normal; font-weight: @font-weight-heavy; diff --git a/demo/src/less/lib/mixins.less b/demo/src/less/lib/mixins.less index fbf36546..821d2b3e 100644 --- a/demo/src/less/lib/mixins.less +++ b/demo/src/less/lib/mixins.less @@ -33,6 +33,7 @@ // --------------------------------------- .font-size(@font-size: 16) { @rem: round((@font-size / 16), 3); + font-size: (@font-size * 1px); font-size: ~'@{rem}rem'; } |