diff --git a/frontend/src/_common.sass b/frontend/src/_common.sass index 1205f78b3..2b82abf57 100644 --- a/frontend/src/_common.sass +++ b/frontend/src/_common.sass @@ -11,49 +11,8 @@ @use "icons.scss" -$icons: '~/Assets/icons/fradrive' +$icons: '~/assets/icons/fradrive' @function ico-content($ico) @return url('#{$icons}/#{$ico}.svg') -@font-face - font-family: "FRADrive Sans" - src: url('./../../static/wp-5.73/FRADriveSans-Regular.woff2') format('woff2'), url('./../../static/wp-5.73/FRADriveSans-Regular.woff') format('woff') - font-weight: 100 500 - font-style: normal -@font-face - font-family: "FRADrive Sans" - src: url('./../../static/wp-5.73/FRADriveSans-Italic.woff2') format('woff2'), url('./../../static/wp-5.73/FRADriveSans-Italic.woff') format('woff') - font-weight: 100 500 - font-style: italic -@font-face - font-family: "FRADrive Sans" - src: url('./../../static/wp-5.73/FRADriveSans-Bold.woff2') format('woff2'), url('./../../static/wp-5.73/FRADriveSans-Bold.woff') format('woff') - font-weight: 600 1000 - font-style: normal -@font-face - font-family: "FRADrive Sans" - src: url('./../../static/wp-5.73/FRADriveSans-BoldItalic.woff2') format('woff2'), url('./../../static/wp-5.73/FRADriveSans-BoldItalic.woff') format('woff') - font-weight: 600 1000 - font-style: italic - -@font-face - font-family: "FRADrive Mono" - src: url('./../../static/wp-5.73/FRADriveMono-Regular.woff2') format('woff2'), url('./../../static/wp-5.73/FRADriveMono-Regular.woff') format('woff') - font-weight: 100 500 - font-style: normal -@font-face - font-family: "FRADrive Mono" - src: url('./../../static/wp-5.73/FRADriveMono-Italic.woff2') format('woff2'), url('./../../static/wp-5.73/FRADriveMono-Italic.woff') format('woff') - font-weight: 100 500 - font-style: italic -@font-face - font-family: "FRADrive Mono" - src: url('./../../static/wp-5.73/FRADriveMono-Bold.woff2') format('woff2'), url('./../../static/wp-5.73/FRADriveMono-Bold.woff') format('woff') - font-weight: 600 1000 - font-style: normal -@font-face - font-family: "FRADrive Mono" - src: url('./../../static/wp-5.73/FRADriveMono-BoldItalic.woff2') format('woff2'), url('./../../static/wp-5.73/FRADriveMono-BoldItalic.woff') format('woff') - font-weight: 600 1000 - font-style: italic diff --git a/frontend/src/app.sass b/frontend/src/app.sass index 18a8c9859..9134b5f7b 100644 --- a/frontend/src/app.sass +++ b/frontend/src/app.sass @@ -28,9 +28,9 @@ --color-fontsec: #5b5861 // FONTS - --font-base: 'FRADrive Sans', 'Arial', sans-serif + --font-base: 'Arial', sans-serif --font-logo: var(--font-base) - --font-monospace: 'FRADrive Mono', 'Arial Mono', monospace + --font-monospace: 'Arial Mono', monospace // DIMENSIONS --header-height: 100px diff --git a/webpack.config.js b/webpack.config.js index c6b8500e9..10c12022a 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -13,7 +13,6 @@ const request = require('request-promise'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin'); -const FontfacegenPlugin = require('fontfacegen-webpack-plugin'); const { WebpackManifestPlugin } = require('webpack-manifest-plugin'); const { CleanWebpackPlugin } = require('clean-webpack-plugin'); const CopyPlugin = require('copy-webpack-plugin'); @@ -132,9 +131,6 @@ async function webpackConfig() { generate: (seed, files, entrypoints) => Object.keys(entrypoints).reduce((acc, fs) => ({...acc, [fs]: files.filter(file => entrypoints[fs].filter(basename => !(/\.map$/.test(basename))).some(basename => file.path.endsWith(basename))).filter(file => file.isInitial).map(file => file.path)}), {}), serialize: yaml.dump }), - new FontfacegenPlugin({ - tasks: ['assets/fonts/fradrive/'] - }), new CleanWebpackPlugin({ cleanOnceBeforeBuildPatterns: [ path.resolve(__dirname, 'static'), path.resolve(__dirname, 'well-known'),