diff --git a/app/assets/stylesheets/constants.scss b/app/assets/stylesheets/constants.scss index 00661294f..e22b9cccd 100644 --- a/app/assets/stylesheets/constants.scss +++ b/app/assets/stylesheets/constants.scss @@ -1,5 +1,3 @@ -@import url(https://fonts.googleapis.com/css?family=Lato:400,400i,700&subset=latin-ext); - //============================================================================== // Colors //============================================================================== diff --git a/app/javascript/packs/fonts.js b/app/javascript/packs/fonts.js new file mode 100644 index 000000000..061b2ec01 --- /dev/null +++ b/app/javascript/packs/fonts.js @@ -0,0 +1 @@ +require("typeface-lato"); diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 0fa7b6fba..bb3c9d175 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,6 +17,7 @@ <%= favicon_link_tag "favicon-16.png", type: "image/png", size: "16x16" %> <%= favicon_link_tag "favicon-32.png", type: "image/png", size: "32x32" %> <%= favicon_link_tag "favicon-48.png", type: "image/png", size: "48x48" %> + <%= stylesheet_pack_tag 'fonts' %> <%= stylesheet_pack_tag 'fontawesome' %> <%= csrf_meta_tags %> diff --git a/package.json b/package.json index 8bd80ed99..5fc7a8838 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "@babel/preset-env": "^7.0.0", "@babel/preset-react": "^7.0.0", "@fortawesome/fontawesome-free": "^5.2.0", + "@joeattardi/emoji-button": "^2.5.4", "@rails/webpacker": "^4.0.7", "autoprefixer": "^7.2.6", "axios": "0.18.1", @@ -62,7 +63,6 @@ "compression-webpack-plugin": "^1.1.11", "croppie": "^2.6.4", "css-loader": "2.1.1", - "@joeattardi/emoji-button": "^2.5.4", "extract-text-webpack-plugin": "^3.0.2", "fabric": "1.6.7", "file-loader": "^4.0.0", @@ -110,6 +110,7 @@ "tui-color-picker": "^2.2.0", "tui-image-editor": "git://github.com/biosistemika/tui.image-editor", "twemoji": "^12.1.4", + "typeface-lato": "^0.0.75", "webpack": "^4.35.2", "webpack-cli": "^3.3.5", "webpack-manifest-plugin": "^1.3.2", diff --git a/yarn.lock b/yarn.lock index 2ae39f6be..d5d1fee86 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9768,6 +9768,11 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= +typeface-lato@^0.0.75: + version "0.0.75" + resolved "https://registry.yarnpkg.com/typeface-lato/-/typeface-lato-0.0.75.tgz#8aa11c5611dc38416837c089b265a2abd1f7dd31" + integrity sha512-iA5uJD4PSTyIE4BDiSOexQeXkDkiJuX4Hu3wh3saJ06EB2TvJayab1Lbbmqq2je/LQv7KCQZHZmC0k4hedd8sw== + typescript-eslint-parser@^16.0.0: version "16.0.1" resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-16.0.1.tgz#b40681c7043b222b9772748b700a000b241c031b"