mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-12 15:35:15 +00:00
Include font awesome in assets.
This commit is contained in:
5
package-lock.json
generated
Normal file → Executable file
5
package-lock.json
generated
Normal file → Executable file
@@ -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",
|
||||
|
3
package.json
Normal file → Executable file
3
package.json
Normal file → Executable file
@@ -17,5 +17,8 @@
|
||||
"laravel-mix": "^1.0",
|
||||
"lodash": "^4.17.4",
|
||||
"vue": "^2.5.7"
|
||||
},
|
||||
"dependencies": {
|
||||
"font-awesome": "^4.7.0"
|
||||
}
|
||||
}
|
||||
|
2
resources/assets/js/bootstrap.js
vendored
2
resources/assets/js/bootstrap.js
vendored
@@ -53,3 +53,5 @@ if (token) {
|
||||
// cluster: 'mt1',
|
||||
// encrypted: true
|
||||
// });
|
||||
|
||||
/** Include font awesome */
|
6
resources/assets/sass/app.scss
vendored
6
resources/assets/sass/app.scss
vendored
@@ -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";
|
Reference in New Issue
Block a user