Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(interface): import bootstrap and font awesome properly #81

Merged
merged 2 commits into from
Feb 15, 2024
Merged

fix(interface): import bootstrap and font awesome properly #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6987ec
fix(interface): Import bootstrap and font awesome properly
endes0 Dec 18, 2023
43f538d
fixes
endes0 Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions src/interface/styles/base/variables.scss
View file
Open in desktop
endes0 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ $color-text-primary: #EBF3FA;


// Font size
$font-size-base: 16px;
$font-size-base-sm: 12px;
$font-size-base: 1rem;
$font-size-base-sm: 1rem;

$font-size-xs: 0.75rem;
$font-size-sm: 0.875rem;
$font-size-m: 1rem;
$font-size-lg: 1.25rem;
$font-size-xl: 1.75rem;
$font-size-xl: 1.75rem;
6 changes: 2 additions & 4 deletions src/interface/styles/vendor/main.scss
View file
Open in desktop
endes0 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
// @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";
16 changes: 8 additions & 8 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down