Merge pull request #12 from Seneca-CDOT/fix-fonts

Fix #133: Fix font
main
つばめ 4 years ago committed by GitHub
commit 11900231c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      striker-ui/.eslintrc.json
  2. 5
      striker-ui/package-lock.json
  3. 7
      striker-ui/package.json
  4. 1
      striker-ui/theme/index.ts

@ -16,8 +16,7 @@
"plugin:prettier/recommended", "plugin:prettier/recommended",
"plugin:react/recommended", "plugin:react/recommended",
"plugin:react-hooks/recommended", "plugin:react-hooks/recommended",
"prettier/@typescript-eslint", "prettier"
"prettier/react"
], ],
"plugins": [ "plugins": [
"@typescript-eslint", "@typescript-eslint",

@ -5588,11 +5588,6 @@
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.7.1.tgz", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.7.1.tgz",
"integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==" "integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg=="
}, },
"typeface-roboto": {
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/typeface-roboto/-/typeface-roboto-1.1.13.tgz",
"integrity": "sha512-YXvbd3a1QTREoD+FJoEkl0VQNJoEjewR2H11IjVv4bp6ahuIcw0yyw/3udC4vJkHw3T3cUh85FTg8eWef3pSaw=="
},
"typeface-roboto-condensed": { "typeface-roboto-condensed": {
"version": "1.1.13", "version": "1.1.13",
"resolved": "https://registry.npmjs.org/typeface-roboto-condensed/-/typeface-roboto-condensed-1.1.13.tgz", "resolved": "https://registry.npmjs.org/typeface-roboto-condensed/-/typeface-roboto-condensed-1.1.13.tgz",

@ -16,10 +16,9 @@
"@material-ui/styles": "^4.11.4", "@material-ui/styles": "^4.11.4",
"next": "^10.2.3", "next": "^10.2.3",
"pretty-bytes": "^5.6.0", "pretty-bytes": "^5.6.0",
"react": "17.0.1", "react": "17.0.2",
"react-dom": "17.0.1", "react-dom": "17.0.2",
"swr": "^0.4.2", "swr": "^0.5.6",
"typeface-roboto": "^1.1.13",
"typeface-roboto-condensed": "^1.1.13" "typeface-roboto-condensed": "^1.1.13"
}, },
"devDependencies": { "devDependencies": {

@ -7,6 +7,7 @@ import {
DISABLED, DISABLED,
BORDER_RADIUS, BORDER_RADIUS,
} from '../lib/consts/DEFAULT_THEME'; } from '../lib/consts/DEFAULT_THEME';
import 'typeface-roboto-condensed';
const theme: Theme = createMuiTheme({ const theme: Theme = createMuiTheme({
palette: { palette: {

Loading…
Cancel
Save