Merge pull request #56 from yoanmarchal/switch-font-load

switch font load
yoanmarchal · Mar 8, 2019 · 9bd30ac · 9bd30ac
2 parents bb7f464 + 5841f64
commit 9bd30ac
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -0,0 +1,3 @@
+{
+  "esversion": 6
+}
diff --git a/nuxt.config.js b/nuxt.config.js
@@ -31,11 +31,7 @@ module.exports = {
       }
     ],
     link: [
-      { rel: "icon", type: "image/x-icon", href: "/favicon.ico" },
-      {
-        rel: "stylesheet",
-        href: "https://fonts.googleapis.com/css?family=Archivo+Black"
-      }
+      { rel: "icon", type: "image/x-icon", href: "/favicon.ico" }
     ]
   },
   css: ["~/assets/grid.css", "bf-solid/dist/solid.latest.css"],
@@ -46,7 +42,12 @@ module.exports = {
    ** Customize the progress bar color
    */
   loading: { color: "#3B8070" },
-  modules: ["@nuxtjs/markdownit", "@nuxtjs/pwa", "@nuxtjs/axios"],
+  modules: ["@nuxtjs/markdownit", "@nuxtjs/pwa", "@nuxtjs/axios", 'nuxt-webfontloader'],
+  webfontloader: {
+    google: {
+      families: ['Archivo+Black:400'] //Loads Lato font with weights 400 and 700
+    }
+  },
   markdownit: {
     injected: true,
     preset: "default",

diff --git a/package.json b/package.json
@@ -25,6 +25,7 @@
     "netlify-lambda": "1.4.2",
     "node-sass": "4.11.0",
     "nuxt": "2.4.5",
+    "nuxt-webfontloader": "^1.0.0",
     "sass-loader": "7.1.0",
     "vue-moment": "4.0.0"
   },

diff --git a/yarn.lock b/yarn.lock
@@ -5963,6 +5963,13 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
+nuxt-webfontloader@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/nuxt-webfontloader/-/nuxt-webfontloader-1.0.0.tgz#99a05bf56f9ed95e88df30154216bf93f9187629"
+  integrity sha512-1YsAzAN2SZGmrf9LvOrpGdnffEeOnh426NUgkhdMLDRSJxk6qdo+M23julOtAJPaF4oXE4rx9okGvDDFvvGUkg==
+  dependencies:
+    webfontloader "^1.6.28"
+
 nuxt@2.4.5:
   version "2.4.5"
   resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.4.5.tgz#3f3256c47e78038ef8081e522181aa2578bddcea"
@@ -8784,6 +8791,11 @@ watchpack@^1.5.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
+webfontloader@^1.6.28:
+  version "1.6.28"
+  resolved "https://registry.yarnpkg.com/webfontloader/-/webfontloader-1.6.28.tgz#db786129253cb6e8eae54c2fb05f870af6675bae"
+  integrity sha1-23hhKSU8tujq5UwvsF+HCvZnW64=
+
 webpack-bundle-analyzer@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.0.3.tgz#dbc7fff8f52058b6714a20fddf309d0790e3e0a0"