complete rewrite #8

Manually merged
samuel-p merged 36 commits from develop into master 2020-06-30 15:59:35 +00:00
2 changed files with 0 additions and 7 deletions
Showing only changes of commit c1666db02f - Show all commits

5
package-lock.json generated
View file

@ -3158,11 +3158,6 @@
"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
"dev": true "dev": true
}, },
"fork-awesome": {
"version": "1.1.7",
"resolved": "https://registry.npmjs.org/fork-awesome/-/fork-awesome-1.1.7.tgz",
"integrity": "sha512-IHI7XCSXrKfUIWslse8c/PaaVDT1oBaYge+ju40ihL2ooiQeBpTr4wvIXhgTd2NuhntlvX+M5jYHAPTzNlmv0g=="
},
"form-data": { "form-data": {
"version": "2.3.3", "version": "2.3.3",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",

View file

@ -5,9 +5,7 @@
@import "~bootstrap/scss/utilities/display"; @import "~bootstrap/scss/utilities/display";
@import "~bootstrap/scss/utilities/text"; @import "~bootstrap/scss/utilities/text";
@import "~bootstrap/scss/utilities/float"; @import "~bootstrap/scss/utilities/float";
$fa-font-path: "../font"; $fa-font-path: "../font";
@import "~fork-awesome/scss/fork-awesome";
@import "~@fortawesome/fontawesome-free/scss/fontawesome"; @import "~@fortawesome/fontawesome-free/scss/fontawesome";
@import "~@fortawesome/fontawesome-free/scss/solid"; @import "~@fortawesome/fontawesome-free/scss/solid";
@import "~@fortawesome/fontawesome-free/scss/brands"; @import "~@fortawesome/fontawesome-free/scss/brands";