kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 03:53:37 +00:00
Code Issues Projects Releases Wiki Activity

Include font awesome in assets.

Browse Source
This commit is contained in:
James Cole
2018-02-03 09:14:39 +01:00
parent d81c99bcda
commit 352cdf75c8
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package-lock.json generated Normal file → Executable file
View File

@@ -3758,6 +3758,11 @@
"debug": "3.1.0" "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": { "for-in": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",

3
package.json Normal file → Executable file
View File

@@ -17,5 +17,8 @@
"laravel-mix": "^1.0", "laravel-mix": "^1.0",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"vue": "^2.5.7" "vue": "^2.5.7"
},
"dependencies": {
"font-awesome": "^4.7.0"
} }
} }

2
resources/assets/js/bootstrap.js vendored
View File

@@ -53,3 +53,5 @@ if (token) {
// cluster: 'mt1', // cluster: 'mt1',
// encrypted: true // encrypted: true
// }); // });
/** Include font awesome */

6
resources/assets/sass/app.scss vendored
View File

@@ -1,9 +1,9 @@
// Fonts
@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600");
// Variables // Variables
@import "variables"; @import "variables";
// Bootstrap // Bootstrap
@import "~bootstrap-sass/assets/stylesheets/bootstrap"; @import "~bootstrap-sass/assets/stylesheets/bootstrap";
// Font awesome
@import "~font-awesome/css/font-awesome";