Merge branch 'main' into app-ads

modrinth · Aug 28, 2024 · 805a25e · 805a25e
2 parents 68a080d + 4bafae8
commit 805a25e
Show file tree

Hide file tree

Showing 7 changed files with 567 additions and 575 deletions.
diff --git a/.github/workflows/app-release.yml b/.github/workflows/app-release.yml
@@ -78,7 +78,7 @@ jobs:
         if: startsWith(matrix.platform, 'ubuntu')
         run: |
           sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libssl-dev sqlite3
+          sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev pkg-config libayatana-appindicator3-dev librsvg2-dev
 
       - name: Install frontend dependencies
         run: pnpm install

diff --git a/apps/frontend/src/assets/styles/layout.scss b/apps/frontend/src/assets/styles/layout.scss
@@ -62,6 +62,10 @@
   .normal-page__content {
     grid-area: content;
   }
+
+  .normal-page__header {
+    grid-area: header;
+  }
 }
 
 @media (min-width: 1024px) {
@@ -161,4 +165,8 @@
     max-width: calc(80rem - 18.75rem - 0.75rem);
     //overflow-x: hidden;
   }
+
+  .normal-page__header {
+    grid-area: header;
+  }
 }