Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

feat: use new font #1124

Merged
merged 4 commits into from
Apr 4, 2024
Merged

feat: use new font #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5a09bb
fix: use new font
spaenleh Mar 28, 2024
684dcf3
fix: remove old font
spaenleh Mar 28, 2024
927fb52
Merge branch 'main' into apply-new-font
pyphilia Apr 4, 2024
4e306d5
refactor: update graasp ui
pyphilia Apr 4, 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
4 changes: 2 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
content="%VITE_VERSION% @ %VITE_BUILD_TIMESTAMP%"
/>

<!-- Load Roboto font from Google fonts -->
<!-- Load Nunito font from Google fonts -->
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
href="https://fonts.googleapis.com/css2?family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap"
/>
<title>Graasp Builder</title>
</head>
Expand Down
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 @@ -24,7 +24,7 @@
"@graasp/query-client": "3.2.0",
"@graasp/sdk": "4.3.1",
"@graasp/translations": "1.25.3",
"@graasp/ui": "4.12.1",
"@graasp/ui": "4.14.0",
"@mui/icons-material": "5.15.11",
"@mui/lab": "5.0.0-alpha.166",
"@mui/material": "5.15.11",
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,9 +1354,9 @@ __metadata:
languageName: node
linkType: hard

"@graasp/ui@npm:4.12.1":
version: 4.12.1
resolution: "@graasp/ui@npm:4.12.1"
"@graasp/ui@npm:4.14.0":
version: 4.14.0
resolution: "@graasp/ui@npm:4.14.0"
dependencies:
"@ag-grid-community/client-side-row-model": "npm:31.1.1"
"@ag-grid-community/react": "npm:^31.1.1"
Expand Down Expand Up @@ -1388,7 +1388,7 @@ __metadata:
react-router-dom: ^6.11.0
stylis: ^4.1.3
stylis-plugin-rtl: ^2.1.1
checksum: 10/a7593f588d50798f0daf43a05dc332d3c4604dc3d50a2beb66f652d402a02deff6ab341f4bdb9a52eeb6f17d6c209d9ec409022a961deea185cd3452a5bf7ae9
checksum: 10/ae57c39dff322e2ba9063d8a30c7509e7bed8ddd068a1e878f85dbf2e855bf2296c0b862047b3b8baea562aa77dd1f2c7156ebc4e32a796c282f30859e2a0c7c
languageName: node
linkType: hard

Expand Down Expand Up @@ -7146,7 +7146,7 @@ __metadata:
"@graasp/query-client": "npm:3.2.0"
"@graasp/sdk": "npm:4.3.1"
"@graasp/translations": "npm:1.25.3"
"@graasp/ui": "npm:4.12.1"
"@graasp/ui": "npm:4.14.0"
"@mui/icons-material": "npm:5.15.11"
"@mui/lab": "npm:5.0.0-alpha.166"
"@mui/material": "npm:5.15.11"
Expand Down