gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

empty icon for some menu actions do de-emphasize less important items

Browse Source
This commit is contained in:
zadam 2019-04-14 13:51:21 +02:00
parent b2d4330692
commit 71916b5e28
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/public/javascripts/services/tree_context_menu.js
View File

@ -112,9 +112,9 @@ async function getTopLevelItems(event) {
{ title: "Delete <kbd>Delete</kbd>", cmd: "delete", uiIcon: "trash", { title: "Delete <kbd>Delete</kbd>", cmd: "delete", uiIcon: "trash",
enabled: isNotRoot && parentNote.type !== 'search' }, enabled: isNotRoot && parentNote.type !== 'search' },
{ title: "----" }, { title: "----" },
isHoisted ? null : { title: "Hoist note <kbd>Ctrl-H</kbd>", cmd: "hoist", uiIcon: "arrow-up" }, isHoisted ? null : { title: "Hoist note <kbd>Ctrl-H</kbd>", cmd: "hoist", uiIcon: "empty" },
!isHoisted || !isNotRoot ? null : { title: "Unhoist note <kbd>Ctrl-H</kbd>", cmd: "unhoist", uiIcon: "arrow-up" }, !isHoisted || !isNotRoot ? null : { title: "Unhoist note <kbd>Ctrl-H</kbd>", cmd: "unhoist", uiIcon: "arrow-up" },
{ title: "Edit branch prefix <kbd>F2</kbd>", cmd: "editBranchPrefix", uiIcon: "pencil", { title: "Edit branch prefix <kbd>F2</kbd>", cmd: "editBranchPrefix", uiIcon: "empty",
enabled: isNotRoot && parentNote.type !== 'search'}, enabled: isNotRoot && parentNote.type !== 'search'},
{ title: "----" }, { title: "----" },
{ title: "Protect subtree", cmd: "protectSubtree", uiIcon: "shield-check" }, { title: "Protect subtree", cmd: "protectSubtree", uiIcon: "shield-check" },
@ -129,14 +129,14 @@ async function getTopLevelItems(event) {
{ title: "Paste after", cmd: "pasteAfter", uiIcon: "clipboard", { title: "Paste after", cmd: "pasteAfter", uiIcon: "clipboard",
enabled: clipboardIds.length > 0 && isNotRoot && parentNote.type !== 'search' }, enabled: clipboardIds.length > 0 && isNotRoot && parentNote.type !== 'search' },
{ title: "----" }, { title: "----" },
{ title: "Export", cmd: "export", uiIcon: "arrow-up-right", { title: "Export", cmd: "export", uiIcon: "empty",
enabled: note.type !== 'search' }, enabled: note.type !== 'search' },
{ title: "Import into note", cmd: "importIntoNote", uiIcon: "arrow-down-left", { title: "Import into note", cmd: "importIntoNote", uiIcon: "empty",
enabled: note.type !== 'search' }, enabled: note.type !== 'search' },
{ title: "----" }, { title: "----" },
{ title: "Collapse subtree <kbd>Alt+-</kbd>", cmd: "collapseSubtree", uiIcon: "align-justify" }, { title: "Collapse subtree <kbd>Alt+-</kbd>", cmd: "collapseSubtree", uiIcon: "align-justify" },
{ title: "Force note sync", cmd: "forceNoteSync", uiIcon: "refresh" }, { title: "Force note sync", cmd: "forceNoteSync", uiIcon: "refresh" },
{ title: "Sort alphabetically <kbd>Alt+S</kbd>", cmd: "sortAlphabetically", uiIcon: "arrows-v" } { title: "Sort alphabetically <kbd>Alt+S</kbd>", cmd: "sortAlphabetically", uiIcon: "empty" }
].filter(row => row !== null); ].filter(row => row !== null);
} }

5
src/public/stylesheets/style.css
View File

@ -928,4 +928,9 @@ a.external:after, a[href^="http://"]:after, a[href^="https://"]:after {
.card { .card {
background-color: inherit !important; background-color: inherit !important;
border-color: var(--main-border-color) !important; border-color: var(--main-border-color) !important;
}
.jam-empty {
width: 1em;
display: inline-block;
} }

26
src/views/desktop.ejs
View File

@ -61,32 +61,32 @@
Sync (<span id="outstanding-syncs-count">0</span>) Sync (<span id="outstanding-syncs-count">0</span>)
</a> </a>
<a class="dropdown-item" id="show-help-button">
<span class="jam jam-help"></span>
Show Help
<kbd>F1</kbd>
</a>
<a class="dropdown-item" id="open-dev-tools-button"> <a class="dropdown-item" id="open-dev-tools-button">
<span class="jam jam-terminal"></span> <span class="jam jam-terminal"></span>
Open Dev Tools Open Dev Tools
<kbd>CTRL+SHIFT+I</kbd> <kbd>CTRL+SHIFT+I</kbd>
</a> </a>
<a class="dropdown-item" id="reload-frontend-button" title="Reload can help with some visual glitches without restarting the whole app.">
<span class="jam jam-refresh"></span>
Reload frontend
<kbd>CTRL-R</kbd>
</a>
<a class="dropdown-item" id="open-sql-console-button"> <a class="dropdown-item" id="open-sql-console-button">
<span class="jam jam-database"></span> <span class="jam jam-database"></span>
Open SQL Console Open SQL Console
<kbd>ALT+O</kbd> <kbd>ALT+O</kbd>
</a> </a>
<a class="dropdown-item" id="reload-frontend-button" title="Reload can help with some visual glitches without restarting the whole app.">
<span class="jam jam-empty"></span>
Reload frontend
<kbd>CTRL-R</kbd>
</a>
<a class="dropdown-item" id="show-help-button">
<span class="jam jam-help"></span>
Show Help
<kbd>F1</kbd>
</a>
<a class="dropdown-item" id="show-about-dialog-button"> <a class="dropdown-item" id="show-about-dialog-button">
<span class="jam jam-info"></span> <span class="jam jam-empty"></span>
About Trilium Notes About Trilium Notes
</a> </a>