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

Merge branch 'master' into next58

Browse Source 
# Conflicts:
#	libraries/ckeditor/ckeditor.js
#	libraries/ckeditor/ckeditor.js.map
#	package-lock.json
#	package.json
#	src/public/app/layouts/desktop_layout.js
This commit is contained in:
zadam
2022-11-22 20:46:08 +01:00
parent c92b451033 a76bef1a28
commit 19126b7c6d
141 changed files with 17696 additions and 14852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/public/app/widgets/buttons/global_menu.js
View File

@@ -16,7 +16,7 @@ const TPL = `
}
.global-menu-button {
background-image: url("images/icon-black.png");
background-image: url("${window.glob.assetPath}/images/icon-black.png");
background-repeat: no-repeat;
background-position: 50% 45%;
width: 100%;
@@ -26,7 +26,7 @@ const TPL = `
}
.global-menu-button:hover {
background-image: url("images/icon-color.png");
background-image: url("${window.glob.assetPath}/images/icon-color.png");
}
.global-menu-button-update-available {