diff --git a/package.json b/package.json index d23dc98c..ce3c4013 100644 --- a/package.json +++ b/package.json @@ -26,11 +26,11 @@ }, "homepage": "https://github.com/etsiiull/SIMDE", "dependencies": { + "@fortawesome/fontawesome-free": "^6.5.1", "@popperjs/core": "^2.11.8", "@types/react": "^18.2.15", "@types/react-dom": "^18.2.7", "bootstrap": "^5.1.3", - "font-awesome": "4.7.0", "i18next": "^22.4.14", "i18next-browser-languagedetector": "7.1.0", "i18next-http-backend": "^2.2.0", diff --git a/src/interface/styles/base/variables.scss b/src/interface/styles/base/variables.scss index 4664c4d7..e4d1c9f2 100644 --- a/src/interface/styles/base/variables.scss +++ b/src/interface/styles/base/variables.scss @@ -9,8 +9,8 @@ $color-text-primary: #EBF3FA; // Font size -$font-size-base: 16px; -$font-size-base-sm: 12px; +$font-size-base: 1rem; // 16px; +$font-size-base-sm: 1rem; // 12px; $font-size-xs: 0.75rem; $font-size-sm: 0.875rem; diff --git a/src/interface/styles/vendor/main.scss b/src/interface/styles/vendor/main.scss index e0fb5118..f45073e2 100644 --- a/src/interface/styles/vendor/main.scss +++ b/src/interface/styles/vendor/main.scss @@ -1,4 +1,5 @@ // @import '../node_modules/bootstrap/dist/css/bootstrap.min.css'; // @import '../node_modules/font-awesome/css/font-awesome.min.css'; -// @import "bootstrap/scss/bootstrap"; +@import "bootstrap/scss/bootstrap"; +@import "@fortawesome/fontawesome-free/css/all.css"; \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 4fe058a2..9c0170da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -677,6 +677,13 @@ __metadata: languageName: node linkType: hard +"@fortawesome/fontawesome-free@npm:^6.5.1": + version: 6.5.1 + resolution: "@fortawesome/fontawesome-free@npm:6.5.1" + checksum: dc359ede1ddfc6d91915345143008420001c56b164a6fe95d81bcca631eecca41009bfacf794d55bdb9d927c112119ce90a11cb4f576a815ed69ec681e5eb824 + languageName: node + linkType: hard + "@humanwhocodes/config-array@npm:^0.11.13": version: 0.11.13 resolution: "@humanwhocodes/config-array@npm:0.11.13" @@ -2642,13 +2649,6 @@ __metadata: languageName: node linkType: hard -"font-awesome@npm:4.7.0": - version: 4.7.0 - resolution: "font-awesome@npm:4.7.0" - checksum: 1c456e2939c55192eed67db9c0efb8db3e92fd357ca189ca00030eb44acffa1e9f835288d2204c14b9a9c490a7b14b7090dfaff80ded6b2473f50a923dfb41e7 - languageName: node - linkType: hard - "foreground-child@npm:^3.1.0": version: 3.1.1 resolution: "foreground-child@npm:3.1.1" @@ -4755,6 +4755,7 @@ __metadata: version: 0.0.0-use.local resolution: "simde@workspace:." dependencies: + "@fortawesome/fontawesome-free": "npm:^6.5.1" "@popperjs/core": "npm:^2.11.8" "@types/node": "npm:^20.8.9" "@types/react": "npm:^18.2.15" @@ -4768,7 +4769,6 @@ __metadata: eslint: "npm:^8.45.0" eslint-plugin-react-hooks: "npm:^4.6.0" eslint-plugin-react-refresh: "npm:^0.4.3" - font-awesome: "npm:4.7.0" i18next: "npm:^22.4.14" i18next-browser-languagedetector: "npm:7.1.0" i18next-http-backend: "npm:^2.2.0"