diff --git a/.stylelintrc.json b/.stylelintrc.json index 45d2b17..a7ae2ac 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -1,7 +1,3 @@ { - "extends": [ - "stylelint-config-standard", - "stylelint-config-standard-scss", - "stylelint-config-recommended-vue" - ] + "extends": ["stylelint-config-standard", "stylelint-config-recommended-vue"] } diff --git a/package.json b/package.json index 051018e..3fcc1a5 100644 --- a/package.json +++ b/package.json @@ -14,14 +14,14 @@ "tauri": "tauri" }, "dependencies": { - "@fontsource-variable/noto-sans-sc": "^5.0.3", + "@fontsource/noto-sans-sc": "^5.0.16", + "@fontsource/roboto": "^5.0.8", "@material-design-icons/svg": "^0.14.13", "@tauri-apps/api": "^1.5.1", "vue": "^3.3.8", "vuetify": "^3.4.0" }, "devDependencies": { - "@fontsource/roboto": "^5.0.8", "@mdi/js": "^7.3.67", "@tauri-apps/cli": "^1.5.6", "@types/node": "^20.9.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 84e10f6..8590d3d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,9 +5,12 @@ settings: excludeLinksFromLockfile: false dependencies: - '@fontsource-variable/noto-sans-sc': - specifier: ^5.0.3 - version: 5.0.3 + '@fontsource/noto-sans-sc': + specifier: ^5.0.16 + version: 5.0.16 + '@fontsource/roboto': + specifier: ^5.0.8 + version: 5.0.8 '@material-design-icons/svg': specifier: ^0.14.13 version: 0.14.13 @@ -22,9 +25,6 @@ dependencies: version: 3.4.0(typescript@5.2.2)(vite-plugin-vuetify@1.0.2)(vue@3.3.8) devDependencies: - '@fontsource/roboto': - specifier: ^5.0.8 - version: 5.0.8 '@mdi/js': specifier: ^7.3.67 version: 7.3.67 @@ -738,13 +738,13 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@fontsource-variable/noto-sans-sc@5.0.3: - resolution: {integrity: sha512-q0JNlXUyqUNzcNEn1wUtUl/8VZ2JmpdQYdh0ImtNRDQskWF4EldBTO3MdFZHUs/JJtnOQ/zZoFjfAOuXisYeKw==} + /@fontsource/noto-sans-sc@5.0.16: + resolution: {integrity: sha512-T3+1giTYAs4TemiReUp2gF2Pskv2fOSZ/yOuk71X7tT/gbYWX6AUGwmPkMyFulxtt07XnIttA/z3VX7bZKQpKA==} dev: false /@fontsource/roboto@5.0.8: resolution: {integrity: sha512-XxPltXs5R31D6UZeLIV1td3wTXU3jzd3f2DLsXI8tytMGBkIsGcc9sIyiupRtA8y73HAhuSCeweOoBqf6DbWCA==} - dev: true + dev: false /@humanwhocodes/config-array@0.11.13: resolution: {integrity: sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==} diff --git a/src/main.ts b/src/main.ts index 84e5a3e..5fd0af6 100644 --- a/src/main.ts +++ b/src/main.ts @@ -7,6 +7,7 @@ import { createVuetify } from "vuetify"; import { aliases, mdi } from "vuetify/iconsets/mdi-svg"; import "@fontsource/roboto/latin.css"; +import "@fontsource/noto-sans-sc"; const vuetify = createVuetify({ icons: { defaultSet: "mdi", aliases, sets: { mdi } }, diff --git a/src/styles.css b/src/styles.css index 992c567..7be5e37 100644 --- a/src/styles.css +++ b/src/styles.css @@ -3,4 +3,5 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; text-size-adjust: 100%; + font-family: Roboto, "Noto Sans SC", sans-serif; } diff --git a/src/views/KeygenView.vue b/src/views/KeygenView.vue index 74238f8..f7eecf2 100644 --- a/src/views/KeygenView.vue +++ b/src/views/KeygenView.vue @@ -20,7 +20,6 @@ const file = ref(); font-weight: 300; line-height: 6rem; letter-spacing: -0.0156em; - font-family: Roboto, sans-serif; text-transform: none; }