Skip to content

Commit f4eb332

Browse files
authored
fix(interface): import bootstrap and font awesome properly (#81)
* fix(interface): Import bootstrap and font awesome properly * fixes
1 parent 92a2d54 commit f4eb332

File tree

4 files changed

+14
-16
lines changed

4 files changed

+14
-16
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
},
2727
"homepage": "https://github.com/etsiiull/SIMDE",
2828
"dependencies": {
29+
"@fortawesome/fontawesome-free": "^6.5.1",
2930
"@popperjs/core": "^2.11.8",
3031
"@types/react": "^18.2.15",
3132
"@types/react-dom": "^18.2.7",
3233
"bootstrap": "^5.1.3",
33-
"font-awesome": "4.7.0",
3434
"i18next": "^22.4.14",
3535
"i18next-browser-languagedetector": "7.1.0",
3636
"i18next-http-backend": "^2.2.0",

src/interface/styles/base/variables.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ $color-text-primary: #EBF3FA;
99

1010

1111
// Font size
12-
$font-size-base: 16px;
13-
$font-size-base-sm: 12px;
12+
$font-size-base: 1rem;
13+
$font-size-base-sm: 1rem;
1414

1515
$font-size-xs: 0.75rem;
1616
$font-size-sm: 0.875rem;
1717
$font-size-m: 1rem;
1818
$font-size-lg: 1.25rem;
19-
$font-size-xl: 1.75rem;
19+
$font-size-xl: 1.75rem;

src/interface/styles/vendor/main.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
// @import '../node_modules/bootstrap/dist/css/bootstrap.min.css';
2-
// @import '../node_modules/font-awesome/css/font-awesome.min.css';
3-
4-
// @import "bootstrap/scss/bootstrap";
1+
@import "bootstrap/scss/bootstrap";
2+
@import "@fortawesome/fontawesome-free/css/all.css";

yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,13 @@ __metadata:
677677
languageName: node
678678
linkType: hard
679679

680+
"@fortawesome/fontawesome-free@npm:^6.5.1":
681+
version: 6.5.1
682+
resolution: "@fortawesome/fontawesome-free@npm:6.5.1"
683+
checksum: dc359ede1ddfc6d91915345143008420001c56b164a6fe95d81bcca631eecca41009bfacf794d55bdb9d927c112119ce90a11cb4f576a815ed69ec681e5eb824
684+
languageName: node
685+
linkType: hard
686+
680687
"@humanwhocodes/config-array@npm:^0.11.13":
681688
version: 0.11.13
682689
resolution: "@humanwhocodes/config-array@npm:0.11.13"
@@ -2642,13 +2649,6 @@ __metadata:
26422649
languageName: node
26432650
linkType: hard
26442651

2645-
"font-awesome@npm:4.7.0":
2646-
version: 4.7.0
2647-
resolution: "font-awesome@npm:4.7.0"
2648-
checksum: 1c456e2939c55192eed67db9c0efb8db3e92fd357ca189ca00030eb44acffa1e9f835288d2204c14b9a9c490a7b14b7090dfaff80ded6b2473f50a923dfb41e7
2649-
languageName: node
2650-
linkType: hard
2651-
26522652
"foreground-child@npm:^3.1.0":
26532653
version: 3.1.1
26542654
resolution: "foreground-child@npm:3.1.1"
@@ -4755,6 +4755,7 @@ __metadata:
47554755
version: 0.0.0-use.local
47564756
resolution: "simde@workspace:."
47574757
dependencies:
4758+
"@fortawesome/fontawesome-free": "npm:^6.5.1"
47584759
"@popperjs/core": "npm:^2.11.8"
47594760
"@types/node": "npm:^20.8.9"
47604761
"@types/react": "npm:^18.2.15"
@@ -4768,7 +4769,6 @@ __metadata:
47684769
eslint: "npm:^8.45.0"
47694770
eslint-plugin-react-hooks: "npm:^4.6.0"
47704771
eslint-plugin-react-refresh: "npm:^0.4.3"
4771-
font-awesome: "npm:4.7.0"
47724772
i18next: "npm:^22.4.14"
47734773
i18next-browser-languagedetector: "npm:7.1.0"
47744774
i18next-http-backend: "npm:^2.2.0"

0 commit comments

Comments
 (0)