Browse Source

add google-font module and remove css import of font

Olivier Massot 1 năm trước cách đây
mục cha
commit
4a64fb2dac
4 tập tin đã thay đổi với 33 bổ sung3 xóa
  1. 0 2
      assets/style/main.scss
  2. 7 0
      nuxt.config.ts
  3. 1 0
      package.json
  4. 25 1
      yarn.lock

+ 0 - 2
assets/style/main.scss

@@ -1,5 +1,3 @@
-@import url('https://fonts.googleapis.com/css2?family=Barlow:wght@500;700&display=swap');
-
 body {
   font-family: "Barlow", serif;
   font-style: normal;

+ 7 - 0
nuxt.config.ts

@@ -130,6 +130,7 @@ export default defineNuxtConfig({
     '@nuxtjs/i18n',
     '@nuxt/devtools',
     'nuxt3-leaflet',
+    '@nuxtjs/google-fonts',
   ],
   router: {
     options: {
@@ -187,4 +188,10 @@ export default defineNuxtConfig({
   build: {
     transpile,
   },
+  googleFonts: {
+    families: {
+      Barlow: true,
+    },
+    display: 'block',
+  },
 })

+ 1 - 0
package.json

@@ -30,6 +30,7 @@
     "@fortawesome/free-solid-svg-icons": "^6.5.1",
     "@hcaptcha/vue3-hcaptcha": "^1.3.0",
     "@nuxtjs/date-fns": "^1.5.0",
+    "@nuxtjs/google-fonts": "^3.2.0",
     "@nuxtjs/i18n": "^8.1.1",
     "@pinia-orm/nuxt": "^1.7.0",
     "@pinia/nuxt": "^0.5.1",

+ 25 - 1
yarn.lock

@@ -1526,6 +1526,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nuxtjs/google-fonts@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "@nuxtjs/google-fonts@npm:3.2.0"
+  dependencies:
+    "@nuxt/kit": "npm:^3.10.3"
+    google-fonts-helper: "npm:^3.5.0"
+    pathe: "npm:^1.1.2"
+  checksum: 10c0/bdd4dc825452f9b640da150fb1334e1dd78988b15f565e2bdcb402b5f0565ef9edb0091f0d41f69b32775c621491607efdd80e1911557bf77718f763031d8eb2
+  languageName: node
+  linkType: hard
+
 "@nuxtjs/i18n@npm:^8.1.1":
   version: 8.3.0
   resolution: "@nuxtjs/i18n@npm:8.3.0"
@@ -4497,7 +4508,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"deepmerge@npm:^4.2.2":
+"deepmerge@npm:^4.2.2, deepmerge@npm:^4.3.1":
   version: 4.3.1
   resolution: "deepmerge@npm:4.3.1"
   checksum: 10c0/e53481aaf1aa2c4082b5342be6b6d8ad9dfe387bc92ce197a66dea08bd4265904a087e75e464f14d1347cf2ac8afe1e4c16b266e0561cc5df29382d3c5f80044
@@ -6219,6 +6230,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"google-fonts-helper@npm:^3.5.0":
+  version: 3.6.0
+  resolution: "google-fonts-helper@npm:3.6.0"
+  dependencies:
+    deepmerge: "npm:^4.3.1"
+    hookable: "npm:^5.5.3"
+    ofetch: "npm:^1.3.4"
+    ufo: "npm:^1.5.3"
+  checksum: 10c0/0c87c0b03546af53317bed18a99271fca472fbbc81230226116d11b159a86810d6b595ad28b6d8933c0d91f679c60b4e93bf57ff57e8200d8e533c82ae5a9a4d
+  languageName: node
+  linkType: hard
+
 "gopd@npm:^1.0.1":
   version: 1.0.1
   resolution: "gopd@npm:1.0.1"
@@ -10176,6 +10199,7 @@ __metadata:
     "@nuxtjs/eslint-config-typescript": "npm:^12.1.0"
     "@nuxtjs/eslint-module": "npm:^4.1.0"
     "@nuxtjs/fontawesome": "npm:^1.1.2"
+    "@nuxtjs/google-fonts": "npm:^3.2.0"
     "@nuxtjs/i18n": "npm:^8.1.1"
     "@pinia-orm/nuxt": "npm:^1.7.0"
     "@pinia/nuxt": "npm:^0.5.1"