From 7a22ff909d16d41a95863ebff9f3d618134324c8 Mon Sep 17 00:00:00 2001 From: raky291 Date: Mon, 23 Mar 2020 22:55:51 -0700 Subject: [PATCH] update google font --- .stylelintrc.yml | 9 --------- client/app/core/fontawesome.scss | 2 -- client/app/core/webfontloader.js | 2 +- client/styles/abstracts/_variables.scss | 2 +- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.stylelintrc.yml b/.stylelintrc.yml index f7e5101..a55e269 100644 --- a/.stylelintrc.yml +++ b/.stylelintrc.yml @@ -2,15 +2,6 @@ extends: - stylelint-config-twbs-bootstrap/scss - stylelint-prettier/recommended rules: - at-rule-empty-line-before: - - always - - except: - - blockless-after-same-name-blockless - - first-nested - ignore: - - after-comment - ignoreAtRules: - - else rule-empty-line-before: - always-multi-line - except: diff --git a/client/app/core/fontawesome.scss b/client/app/core/fontawesome.scss index 26b42dc..292f5b1 100644 --- a/client/app/core/fontawesome.scss +++ b/client/app/core/fontawesome.scss @@ -1,5 +1,3 @@ -// Variables - $fa-font-path: '~@fortawesome/fontawesome-free/webfonts'; @import '~@fortawesome/fontawesome-free/scss/fontawesome'; diff --git a/client/app/core/webfontloader.js b/client/app/core/webfontloader.js index 79eed50..e19db51 100644 --- a/client/app/core/webfontloader.js +++ b/client/app/core/webfontloader.js @@ -2,6 +2,6 @@ import WebFont from 'webfontloader'; WebFont.load({ google: { - families: ['Montserrat:300,400,500,700'], + families: ['Poppins:300,400,700,900'], }, }); diff --git a/client/styles/abstracts/_variables.scss b/client/styles/abstracts/_variables.scss index 842636d..f264ced 100644 --- a/client/styles/abstracts/_variables.scss +++ b/client/styles/abstracts/_variables.scss @@ -1,3 +1,3 @@ // Typography -$font-family-base: 'Montserrat', sans-serif; +$font-family-base: 'Poppins', sans-serif;