diff --git a/package-lock.json b/package-lock.json old mode 100644 new mode 100755 index d3da553c45..0bb7e2d589 --- a/package-lock.json +++ b/package-lock.json @@ -3758,6 +3758,11 @@ "debug": "3.1.0" } }, + "font-awesome": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz", + "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=" + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", diff --git a/package.json b/package.json old mode 100644 new mode 100755 index 440c4ab177..bd9df38cf5 --- a/package.json +++ b/package.json @@ -17,5 +17,8 @@ "laravel-mix": "^1.0", "lodash": "^4.17.4", "vue": "^2.5.7" + }, + "dependencies": { + "font-awesome": "^4.7.0" } } diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js index 1ec752f441..05299d9911 100644 --- a/resources/assets/js/bootstrap.js +++ b/resources/assets/js/bootstrap.js @@ -53,3 +53,5 @@ if (token) { // cluster: 'mt1', // encrypted: true // }); + +/** Include font awesome */ \ No newline at end of file diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 1bbc550862..ba8b3cd21d 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -1,9 +1,9 @@ -// Fonts -@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600"); - // Variables @import "variables"; // Bootstrap @import "~bootstrap-sass/assets/stylesheets/bootstrap"; + +// Font awesome +@import "~font-awesome/css/font-awesome"; \ No newline at end of file