diff --git a/lbrytv/webpack.config.js b/lbrytv/webpack.config.js index 8f874a79d..81e51192e 100644 --- a/lbrytv/webpack.config.js +++ b/lbrytv/webpack.config.js @@ -68,6 +68,10 @@ const webConfig = { from: `${STATIC_ROOT}/img/og.png`, to: `${DIST_ROOT}/og.png`, }, + { + from: `${STATIC_ROOT}/font/`, + to: `${DIST_ROOT}/font/`, + }, ]), new DefinePlugin({ IS_WEB: JSON.stringify(true), diff --git a/static/font/font.css b/static/font/font.css new file mode 100644 index 000000000..9bd25afd5 --- /dev/null +++ b/static/font/font.css @@ -0,0 +1,47 @@ +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url('/font/inter/300.woff') format('woff'); +} + +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 300; + font-display: swap; + src: url('/font/inter/300i.woff') format('woff'); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('/font/inter/400.woff') format('woff'); +} + +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 400; + font-display: swap; + src: url('/font/inter/400i.woff') format('woff'); +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('/font/inter/700.woff') format('woff'); +} + +@font-face { + font-family: 'Inter'; + font-style: italic; + font-weight: 700; + font-display: swap; + src: url('/font/inter/700i.woff') format('woff'); +} diff --git a/static/font/inter/300.woff2 b/static/font/inter/300.woff2 deleted file mode 100644 index 97e99c784..000000000 Binary files a/static/font/inter/300.woff2 and /dev/null differ diff --git a/static/font/inter/300i.woff2 b/static/font/inter/300i.woff2 deleted file mode 100644 index 4114f0228..000000000 Binary files a/static/font/inter/300i.woff2 and /dev/null differ diff --git a/static/font/inter/400.woff2 b/static/font/inter/400.woff2 deleted file mode 100644 index 25b72283d..000000000 Binary files a/static/font/inter/400.woff2 and /dev/null differ diff --git a/static/font/inter/400i.woff2 b/static/font/inter/400i.woff2 deleted file mode 100644 index 25b72283d..000000000 Binary files a/static/font/inter/400i.woff2 and /dev/null differ diff --git a/static/font/inter/700.woff2 b/static/font/inter/700.woff2 deleted file mode 100644 index df70c25a6..000000000 Binary files a/static/font/inter/700.woff2 and /dev/null differ diff --git a/static/font/inter/700i.woff2 b/static/font/inter/700i.woff2 deleted file mode 100644 index 67d27e01f..000000000 Binary files a/static/font/inter/700i.woff2 and /dev/null differ diff --git a/static/index-electron.html b/static/index-electron.html index c02566069..3596902d8 100644 --- a/static/index-electron.html +++ b/static/index-electron.html @@ -3,6 +3,7 @@ + LBRY diff --git a/static/index-web.html b/static/index-web.html index 612866183..f72ed08b0 100644 --- a/static/index-web.html +++ b/static/index-web.html @@ -4,6 +4,7 @@ + lbry.tv diff --git a/ui/scss/all.scss b/ui/scss/all.scss index 9443f586c..2ac8050a9 100644 --- a/ui/scss/all.scss +++ b/ui/scss/all.scss @@ -5,7 +5,6 @@ @import 'themes/dark.scss'; @import 'init/vars'; @import 'init/mixins'; -@import 'init/type'; @import 'init/gui'; @import 'component/animation'; @import 'component/button'; diff --git a/ui/scss/init/_type.scss b/ui/scss/init/_type.scss deleted file mode 100644 index e464605e1..000000000 --- a/ui/scss/init/_type.scss +++ /dev/null @@ -1,50 +0,0 @@ -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 300; - font-display: swap; - src: url('../../static/font/inter/300.woff2') format('woff2'), url('../../static/font/inter/300.woff') format('woff'); -} - -@font-face { - font-family: 'Inter'; - font-style: italic; - font-weight: 300; - font-display: swap; - src: url('../../static/font/inter/300i.woff2') format('woff2'), - url('../../static/font/inter/300i.woff') format('woff'); -} - -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url('../../static/font/inter/400.woff2') format('woff2'), url('../../static/font/inter/400.woff') format('woff'); -} - -@font-face { - font-family: 'Inter'; - font-style: italic; - font-weight: 400; - font-display: swap; - src: url('../../static/font/inter/400i.woff2') format('woff2'), - url('../../static/font/inter/400i.woff') format('woff'); -} - -@font-face { - font-family: 'Inter'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url('../../static/font/inter/700.woff2') format('woff2'), url('../../static/font/inter/700i.woff') format('woff'); -} - -@font-face { - font-family: 'Inter'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url('../../static/font/inter/700i.woff2') format('woff2'), - url('../../static/font/inter/700i.woff') format('woff'); -} diff --git a/webpack.base.config.js b/webpack.base.config.js index a807a9a52..f1d9414a0 100644 --- a/webpack.base.config.js +++ b/webpack.base.config.js @@ -52,15 +52,6 @@ let baseConfig = { }, }, }, - { - test: /\.(woff|woff2)$/, - use: { - loader: 'file-loader', - options: { - outputPath: 'static/font', - }, - }, - }, { test: /\.(vert|frag|glsl)$/, use: { diff --git a/webpack.electron.config.js b/webpack.electron.config.js index 0ee198a08..ff3602999 100644 --- a/webpack.electron.config.js +++ b/webpack.electron.config.js @@ -46,7 +46,7 @@ let mainConfig = { { from: `${STATIC_ROOT}/`, to: `${DIST_ROOT}/electron/static/`, - ignore: ['font/**/*', 'index-web.html'], + ignore: ['index-web.html', 'index-electron.html'], }, { from: `${STATIC_ROOT}/index-electron.html`,