Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 20:06:08 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into feature/client_server_separation

Browse Source
This commit is contained in:
Elian Doran
2025-04-18 14:05:57 +03:00
parent 7443d12ce6 b85f052161
commit 639a56ee7d
5 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
_regroup/.github/actions/build-electron/action.yml vendored
View File

@@ -21,7 +21,7 @@ runs:
# Certificate setup
- name: Import Apple certificates
if: inputs.os == 'macos'
uses: apple-actions/import-codesign-certs@v3
uses: apple-actions/import-codesign-certs@v5
with:
p12-file-base64: ${{ env.APPLE_APP_CERTIFICATE_BASE64 }}
p12-password: ${{ env.APPLE_APP_CERTIFICATE_PASSWORD }}
@@ -30,7 +30,7 @@ runs:
- name: Install Installer certificate
if: inputs.os == 'macos'
uses: apple-actions/import-codesign-certs@v3
uses: apple-actions/import-codesign-certs@v5
with:
p12-file-base64: ${{ env.APPLE_INSTALLER_CERTIFICATE_BASE64 }}
p12-password: ${{ env.APPLE_INSTALLER_CERTIFICATE_PASSWORD }}

2
apps/client/stylesheets/theme-next-dark.css
View File

@@ -232,6 +232,8 @@
--help-kbd-shortcut-shadow: 1px 1px 2px rgba(0, 0, 0, 0.7);
--help-code-color: inherit;
--help-code-background: #565656;
--ck-editor-popup-border-color: var(--modal-border-color);
}
/*

2
apps/client/stylesheets/theme-next-light.css
View File

@@ -232,4 +232,6 @@
--help-kbd-shortcut-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3);
--help-code-color: black;
--help-code-background: #d7d5d5;
--ck-editor-popup-border-color: var(--dropdown-border-color);
}

20
apps/client/stylesheets/theme-next/notes/text.css
View File

@@ -36,14 +36,15 @@
:root .ck.ck-dropdown__panel,
:root .ck-balloon-panel {
--ck-color-panel-background: var(--menu-background-color);
--ck-color-panel-border: var(--modal-border-color);
--ck-color-panel-border: var(--ck-editor-popup-border-color);
box-shadow: 0px 10px 20px rgba(0, 0, 0, var(--dropdown-shadow-opacity));
border: 1px solid var(--modal-border-color) !important;
outline: transparent !important;
border: 1px solid var(--ck-editor-popup-border-color) !important;
border-radius: var(--dropdown-border-radius) !important;
background: var(--menu-background-color) !important;
backdrop-filter: var(--dropdown-backdrop-filter);
padding: var(--menu-padding-size);
padding: 4px;
}
:root ul.ck.ck-list,
@@ -52,6 +53,19 @@
background: transparent;
}
/* Tooltip */
:root div.ck.ck-balloon-panel.ck-tooltip {
--ck-color-panel-background: var(--toast-background); /* Arrow */
border-color: transparent !important;
border-radius: 6px !important;
padding: 0 10px 2px 10px;
background-color: var(--toast-background) !important;
}
:root div.ck.ck-balloon-panel.ck-tooltip * {
color: var(--toast-text-color) !important;
}
/* Dropdown list item */
:root ul.ck.ck-list button.ck-button {
padding: 2px 16px;