Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-11-04 15:11:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into build_add-rpm-electron

Browse Source
This commit is contained in:
Elian Doran 2025-02-04 23:08:10 +02:00
commit 5d3d9162cb
No known key found for this signature in database
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/nightly.yml vendored
View File

@ -51,8 +51,8 @@ jobs:
with: with:
upload_url: ${{ env.GITHUB_UPLOAD_URL }} upload_url: ${{ env.GITHUB_UPLOAD_URL }}
release_id: ${{ env.GITHUB_RELEASE_ID }} release_id: ${{ env.GITHUB_RELEASE_ID }}
asset_path: upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}.zip # path to archive to upload asset_path: upload/TriliumNextNotes-${{ github.ref_name }}-${{ 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_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 asset_content_type: application/zip # required by GitHub API
- name: Deploy installer release - name: Deploy installer release
@ -60,8 +60,8 @@ jobs:
with: with:
upload_url: ${{ env.GITHUB_UPLOAD_URL }} upload_url: ${{ env.GITHUB_UPLOAD_URL }}
release_id: ${{ env.GITHUB_RELEASE_ID }} release_id: ${{ env.GITHUB_RELEASE_ID }}
asset_path: upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}.${{ matrix.os.extension }} # path to archive to upload asset_path: upload/TriliumNextNotes-${{ github.ref_name }}-${{ 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_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 asset_content_type: application/zip # required by GitHub API
nightly-server: nightly-server:
name: Deploy server nightly name: Deploy server nightly
@ -88,6 +88,6 @@ jobs:
with: with:
upload_url: ${{ env.GITHUB_UPLOAD_URL }} upload_url: ${{ env.GITHUB_UPLOAD_URL }}
release_id: ${{ env.GITHUB_RELEASE_ID }} release_id: ${{ env.GITHUB_RELEASE_ID }}
asset_path: upload/TriliumNextNotes-linux-x64-${{ github.ref_name }}.tar.xz # path to archive to upload asset_path: upload/TriliumNextNotes-linux-${{ matrix.arch }}-${{ 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_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 asset_content_type: application/zip # required by GitHub API

2
src/public/app/widgets/editability_select.ts
View File

@ -27,7 +27,7 @@ const TPL = `
<span class="editability-active-desc">${t("editability_select.auto")}</span> <span class="editability-active-desc">${t("editability_select.auto")}</span>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<div class="editability-dropdown dropdown-menu dropdown-menu-right"> <div class="editability-dropdown dropdown-menu dropdown-menu-right tn-dropdown-list">
<a class="dropdown-item" href="#" data-editability="auto"> <a class="dropdown-item" href="#" data-editability="auto">
<span class="check">&check;</span> <span class="check">&check;</span>
${t("editability_select.auto")} ${t("editability_select.auto")}

2
src/public/app/widgets/note_type.js
View File

@ -40,7 +40,7 @@ const TPL = `
<span class="note-type-desc"></span> <span class="note-type-desc"></span>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<div class="note-type-dropdown dropdown-menu dropdown-menu-left"></div> <div class="note-type-dropdown dropdown-menu dropdown-menu-left tn-dropdown-list"></div>
</div> </div>
`; `;

11
src/public/stylesheets/theme-next/shell.css
View File

@ -951,6 +951,9 @@ body.mobile .note-title {
/* /*
* Menus * Menus
*
* Note: apply the "tn-dropdown-list" class for scrollable dropdown menus. Submenus are not
* supported when this class is used.
*/ */
.dropdown-menu { .dropdown-menu {
@ -982,6 +985,14 @@ body.desktop .dropdown-menu::before {
z-index: -1; 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 { body.desktop .dropdown-submenu .dropdown-menu::before {
content: unset; content: unset;
} }