From bc82cdbd01c8e73313a6be1d859d76c989833e8f Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Tue, 4 Feb 2025 22:24:56 +0200 Subject: [PATCH 1/4] style(next): fix broken backdrop blur when scrolling dropdowns --- src/public/app/widgets/editability_select.ts | 2 +- src/public/app/widgets/note_type.js | 2 +- src/public/stylesheets/theme-next/shell.css | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/public/app/widgets/editability_select.ts b/src/public/app/widgets/editability_select.ts index 866a6db7c..c98cfd90f 100644 --- a/src/public/app/widgets/editability_select.ts +++ b/src/public/app/widgets/editability_select.ts @@ -27,7 +27,7 @@ const TPL = ` ${t("editability_select.auto")} -
+
✓ ${t("editability_select.auto")} diff --git a/src/public/app/widgets/note_type.js b/src/public/app/widgets/note_type.js index 150acf4a9..09c73d3cf 100644 --- a/src/public/app/widgets/note_type.js +++ b/src/public/app/widgets/note_type.js @@ -40,7 +40,7 @@ const TPL = ` -
+
`; diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css index 0bb24d775..bf67f537c 100644 --- a/src/public/stylesheets/theme-next/shell.css +++ b/src/public/stylesheets/theme-next/shell.css @@ -951,6 +951,9 @@ body.mobile .note-title { /* * Menus + * + * Note: apply the "tn-dropdown-list" class for scrollable dropdown menus. Submenus are not + * supported when this class is used. */ .dropdown-menu { @@ -982,6 +985,14 @@ body.desktop .dropdown-menu::before { z-index: -1; } +body.desktop .dropdown-menu.tn-dropdown-list { + backdrop-filter: var(--dropdown-backdrop-filter); +} + +body.desktop .dropdown-menu.tn-dropdown-list::before { + display: none; +} + body.desktop .dropdown-submenu .dropdown-menu::before { content: unset; } From 51cbe128665cf5df99bf29094de5af838b30713b Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Tue, 4 Feb 2025 22:05:10 +0200 Subject: [PATCH 2/4] fix(ci): nightly not working due to missing deps --- .github/workflows/nightly.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e3d98817c..6ec8d4db1 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -34,6 +34,9 @@ jobs: uses: actions/setup-node@v4 with: node-version: 20 + - name: Install dependencies + shell: bash + run: npm ci - name: Update nightly version run: npm run ci-update-nightly-version - name: Run the build From d847eab697b33d07117123fa1986c81550ff0423 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Tue, 4 Feb 2025 22:48:17 +0200 Subject: [PATCH 3/4] fix(ci): nightly artifact build --- .github/workflows/nightly.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 6ec8d4db1..2414aec90 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -51,8 +51,8 @@ jobs: with: upload_url: ${{ env.GITHUB_UPLOAD_URL }} release_id: ${{ env.GITHUB_RELEASE_ID }} - asset_path: upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}.zip # path to archive to upload - asset_name: TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}-nightly.zip # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash + asset_path: upload/TriliumNextNotes-${{ github.ref_name }}-${{ matrix.os.name }}-${{ matrix.arch }}.zip # path to archive to upload + asset_name: TriliumNextNotes-${{ github.ref_name }}-${{ matrix.os.name }}-${{ matrix.arch }}-nightly.zip # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash asset_content_type: application/zip # required by GitHub API - name: Deploy installer release @@ -60,8 +60,8 @@ jobs: with: upload_url: ${{ env.GITHUB_UPLOAD_URL }} release_id: ${{ env.GITHUB_RELEASE_ID }} - asset_path: upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}.${{ matrix.os.extension }} # path to archive to upload - asset_name: TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}-nightly.${{ matrix.os.extension }} # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash + asset_path: upload/TriliumNextNotes-${{ github.ref_name }}-${{ matrix.os.name }}-${{ matrix.arch }}.${{ matrix.os.extension }} # path to archive to upload + asset_name: TriliumNextNotes-${{ github.ref_name }}-${{ matrix.os.name }}-${{ matrix.arch }}-nightly.${{ matrix.os.extension }} # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash asset_content_type: application/zip # required by GitHub API nightly-server: name: Deploy server nightly From a9d667e5a929536a2b61b33baace07a3851885c3 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Tue, 4 Feb 2025 23:00:38 +0200 Subject: [PATCH 4/4] fix(ci): nightly build for server ARM --- .github/workflows/nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2414aec90..a904ba1ed 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -88,6 +88,6 @@ jobs: with: upload_url: ${{ env.GITHUB_UPLOAD_URL }} release_id: ${{ env.GITHUB_RELEASE_ID }} - asset_path: upload/TriliumNextNotes-linux-x64-${{ github.ref_name }}.tar.xz # path to archive to upload - asset_name: TriliumNextNotes-linux-x64-nightly.zip # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash + asset_path: upload/TriliumNextNotes-linux-${{ matrix.arch }}-${{ github.ref_name }}.tar.xz # path to archive to upload + asset_name: TriliumNextNotes-linux-${{ matrix.arch }}-nightly.zip # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash asset_content_type: application/zip # required by GitHub API