Move fonts back to project-view/assets

enso-org · Oct 10, 2024 · aba18de · aba18de
1 parent 2bf9b57
commit aba18de
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -39,7 +39,7 @@ app/ide-desktop/lib/dashboard/playwright/.cache/
 app/ide-desktop/lib/dashboard/dist/
 app/gui/view/documentation/assets/stylesheet.css
 app/rust-ffi/pkg
-app/gui/src/assets/font-*.css
+app/gui/src/project-view/assets/font-*.css
 Cargo.lock
 build.json
 app/gui/playwright-report/

diff --git a/app/gui/.gitignore b/app/gui/.gitignore
@@ -28,8 +28,8 @@ playwright-report/
 public/font-dejavu/
 public/font-enso/
 public/font-mplus1/
-src/assets/font-dejavu.css
-src/assets/font-enso.css
-src/assets/font-mplus1.css
+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
diff --git a/build/build/paths.yaml b/build/build/paths.yaml
@@ -26,10 +26,11 @@
         font-mplus1/:
         font-dejavu/:
       src/:
-        assets/:
-          font-enso.css:
-          font-mplus1.css:
-          font-dejavu.css:
+        project-view/:
+          assets/:
+            font-enso.css:
+            font-mplus1.css:
+            font-dejavu.css:
     ide-desktop/:
       client/:
       common/:

diff --git a/build/build/src/project/gui.rs b/build/build/src/project/gui.rs
@@ -71,23 +71,23 @@ impl IsTarget for Gui {
                 "M PLUS 1",
                 "/font-mplus1",
                 &repo_root.app.gui.public.font_mplus_1,
-                &repo_root.app.gui.src.assets.font_mplus_1_css,
+                &repo_root.app.gui.src.project_view.assets.font_mplus_1_css,
             )
             .await?;
             crate::ide::web::dejavu_font::install_sans_mono_with_css(
                 &context.cache,
                 &context.octocrab,
                 "/font-dejavu",
                 &repo_root.app.gui.public.font_dejavu,
-                &repo_root.app.gui.src.assets.font_dejavu_css,
+                &repo_root.app.gui.src.project_view.assets.font_dejavu_css,
             )
             .await?;
             crate::ide::web::enso_font::install_with_css(
                 &context.cache,
                 &context.octocrab,
                 "/font-enso",
                 &repo_root.app.gui.public.font_enso,
-                &repo_root.app.gui.src.assets.font_enso_css,
+                &repo_root.app.gui.src.project_view.assets.font_enso_css,
             )
             .await?;
             crate::web::install(repo_root).await?;