Skip to content

Commit

Permalink
Remove download font scripts (#11317)
Browse files Browse the repository at this point in the history
The fonts were added (by mistake) anyway, but they are rarely changed, and the scripts add unnecessary complexity.

This also fixes some post- #11287 problems.
  • Loading branch information
farmaazon authored Oct 14, 2024
1 parent 244effd commit d1ee7fa
Show file tree
Hide file tree
Showing 23 changed files with 75 additions and 1,522 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Build Artefacts
dist
mockDist
target

# Release body template should not be auto-formatted, as the word wrap does not really looks good in the GitHub UI.
Expand Down
34 changes: 0 additions & 34 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions app/gui/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,5 @@ mockDist
test-results/
playwright-report/

public/font-dejavu/
public/font-enso/
public/font-mplus1/
src/project-view/assets/font-dejavu.css
src/project-view/assets/font-enso.css
src/project-view/assets/font-mplus1.css
src/project-view/util/iconList.json
src/project-view/util/iconName.ts
7 changes: 2 additions & 5 deletions app/gui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,10 @@
"test-dev:unit": "vitest",
"test:e2e": "cross-env NODE_ENV=production playwright test",
"test-dev:e2e": "cross-env NODE_ENV=production playwright test --ui",
"preinstall": "corepack pnpm run generate-metadata && corepack pnpm run download-fonts",
"preinstall": "corepack pnpm run generate-metadata",
"postinstall": "playwright install",
"build-rust-ffi": "wasm-pack build ./rust-ffi --release --target web && wasm-pack build ./rust-ffi --out-dir node-pkg --target nodejs",
"generate-metadata": "node scripts/generateIconMetadata.js",
"download-fonts": "node scripts/downloadFonts.js"
"generate-metadata": "node scripts/generateIconMetadata.js"
},
"dependencies": {
"@aws-amplify/auth": "5.6.5",
Expand Down Expand Up @@ -166,7 +165,6 @@
"@types/mapbox-gl": "^2.7.13",
"@types/shuffle-seed": "^1.1.0",
"@types/tar": "^6.1.4",
"@types/unbzip2-stream": "^1.4.3",
"@types/wicg-file-system-access": "^2023.10.2",
"@types/ws": "^8.5.5",
"@vitejs/plugin-vue": "^5.0.4",
Expand All @@ -188,7 +186,6 @@
"sql-formatter": "^13.0.0",
"tar": "^6.2.1",
"tsx": "^4.7.1",
"unbzip2-stream": "^1.4.3",
"vite-plugin-vue-devtools": "7.3.7",
"vite-plugin-wasm": "^3.3.0",
"vue-react-wrapper": "^0.3.1",
Expand Down
Binary file modified app/gui/public/font-dejavu/DejaVuSansMono-Bold.ttf
Binary file not shown.
217 changes: 0 additions & 217 deletions app/gui/scripts/downloadFonts.js

This file was deleted.

12 changes: 12 additions & 0 deletions app/gui/src/project-view/assets/font-dejavu.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@font-face {
font-family: 'DejaVu Sans Mono';
src: url('/font-dejavu/DejaVuSansMono.ttf');
font-weight: 400;
}

@font-face {
font-family: 'DejaVu Sans Mono';
src: url('/font-dejavu/DejaVuSansMono-Bold.ttf');
font-weight: 700;
}

54 changes: 54 additions & 0 deletions app/gui/src/project-view/assets/font-enso.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-Thin.ttf');
font-weight: 100;
}

@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-ExtraLight.ttf');
font-weight: 200;
}

@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-Light.ttf');
font-weight: 300;
}

@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-Regular.ttf');
font-weight: 400;
}

@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-Medium.ttf');
font-weight: 500;
}

@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-SemiBold.ttf');
font-weight: 600;
}

@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-Bold.ttf');
font-weight: 700;
}

@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-ExtraBold.ttf');
font-weight: 800;
}

@font-face {
font-family: 'Enso';
src: url('/font-enso/Enso-Black.ttf');
font-weight: 900;
}

Loading

0 comments on commit d1ee7fa

Please sign in to comment.