From 4f34fb802b40ada14b296160bbd22bf1f4adb01d Mon Sep 17 00:00:00 2001 From: azivner Date: Fri, 9 Nov 2018 20:45:28 +0100 Subject: [PATCH] minor icon changes --- docs/backend_api/ApiToken.html | 2 +- docs/backend_api/Attribute.html | 2 +- docs/backend_api/BackendScriptApi.html | 2 +- docs/backend_api/Branch.html | 2 +- docs/backend_api/Entity.html | 2 +- docs/backend_api/Link.html | 2 +- docs/backend_api/Note.html | 2 +- docs/backend_api/NoteRevision.html | 2 +- docs/backend_api/Option.html | 2 +- docs/backend_api/RecentNote.html | 2 +- docs/backend_api/entities_api_token.js.html | 2 +- docs/backend_api/entities_attribute.js.html | 2 +- docs/backend_api/entities_branch.js.html | 2 +- docs/backend_api/entities_entity.js.html | 2 +- docs/backend_api/entities_link.js.html | 2 +- docs/backend_api/entities_note.js.html | 2 +- docs/backend_api/entities_note_revision.js.html | 2 +- docs/backend_api/entities_option.js.html | 2 +- docs/backend_api/entities_recent_note.js.html | 2 +- docs/backend_api/global.html | 2 +- docs/backend_api/index.html | 2 +- docs/backend_api/services_backend_script_api.js.html | 2 +- docs/frontend_api/Branch.html | 2 +- docs/frontend_api/FrontendScriptApi.html | 2 +- docs/frontend_api/NoteFull.html | 2 +- docs/frontend_api/NoteShort.html | 2 +- docs/frontend_api/entities_branch.js.html | 2 +- docs/frontend_api/entities_note_full.js.html | 2 +- docs/frontend_api/entities_note_short.js.html | 2 +- docs/frontend_api/global.html | 4 ++-- docs/frontend_api/index.html | 2 +- docs/frontend_api/services_frontend_script_api.js.html | 6 +++--- src/public/javascripts/services/tree_context_menu.js | 2 +- src/public/stylesheets/style.css | 6 ------ src/views/index.ejs | 4 ++-- 35 files changed, 38 insertions(+), 44 deletions(-) diff --git a/docs/backend_api/ApiToken.html b/docs/backend_api/ApiToken.html index d0243577f..0860ebfdb 100644 --- a/docs/backend_api/ApiToken.html +++ b/docs/backend_api/ApiToken.html @@ -288,7 +288,7 @@
diff --git a/docs/backend_api/Attribute.html b/docs/backend_api/Attribute.html index 500540758..3d2aadf8a 100644 --- a/docs/backend_api/Attribute.html +++ b/docs/backend_api/Attribute.html @@ -426,7 +426,7 @@
diff --git a/docs/backend_api/BackendScriptApi.html b/docs/backend_api/BackendScriptApi.html index 20a81859d..5659ad3ad 100644 --- a/docs/backend_api/BackendScriptApi.html +++ b/docs/backend_api/BackendScriptApi.html @@ -3814,7 +3814,7 @@ transactional by default.
diff --git a/docs/backend_api/Branch.html b/docs/backend_api/Branch.html index 8bb6a257d..e4b259864 100644 --- a/docs/backend_api/Branch.html +++ b/docs/backend_api/Branch.html @@ -511,7 +511,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
diff --git a/docs/backend_api/Entity.html b/docs/backend_api/Entity.html index f3afcb969..9888804b6 100644 --- a/docs/backend_api/Entity.html +++ b/docs/backend_api/Entity.html @@ -216,7 +216,7 @@
diff --git a/docs/backend_api/Link.html b/docs/backend_api/Link.html index d5456947e..7ba997e97 100644 --- a/docs/backend_api/Link.html +++ b/docs/backend_api/Link.html @@ -358,7 +358,7 @@ this is different concept than attribute/relation.
diff --git a/docs/backend_api/Note.html b/docs/backend_api/Note.html index 9a7d18e45..e3dbcb795 100644 --- a/docs/backend_api/Note.html +++ b/docs/backend_api/Note.html @@ -6859,7 +6859,7 @@ Cache is note instance scoped.
diff --git a/docs/backend_api/NoteRevision.html b/docs/backend_api/NoteRevision.html index 146c08842..4a49565fa 100644 --- a/docs/backend_api/NoteRevision.html +++ b/docs/backend_api/NoteRevision.html @@ -403,7 +403,7 @@
diff --git a/docs/backend_api/Option.html b/docs/backend_api/Option.html index 959be9ced..fd10300fd 100644 --- a/docs/backend_api/Option.html +++ b/docs/backend_api/Option.html @@ -311,7 +311,7 @@
diff --git a/docs/backend_api/RecentNote.html b/docs/backend_api/RecentNote.html index be57c5c3e..f5b3e375b 100644 --- a/docs/backend_api/RecentNote.html +++ b/docs/backend_api/RecentNote.html @@ -288,7 +288,7 @@
diff --git a/docs/backend_api/entities_api_token.js.html b/docs/backend_api/entities_api_token.js.html index 254b8941c..ba4bef39b 100644 --- a/docs/backend_api/entities_api_token.js.html +++ b/docs/backend_api/entities_api_token.js.html @@ -75,7 +75,7 @@ module.exports = ApiToken;
diff --git a/docs/backend_api/entities_attribute.js.html b/docs/backend_api/entities_attribute.js.html index 06422b789..466968b15 100644 --- a/docs/backend_api/entities_attribute.js.html +++ b/docs/backend_api/entities_attribute.js.html @@ -134,7 +134,7 @@ module.exports = Attribute;
diff --git a/docs/backend_api/entities_branch.js.html b/docs/backend_api/entities_branch.js.html index 771deed06..432f2ef64 100644 --- a/docs/backend_api/entities_branch.js.html +++ b/docs/backend_api/entities_branch.js.html @@ -105,7 +105,7 @@ module.exports = Branch;
diff --git a/docs/backend_api/entities_entity.js.html b/docs/backend_api/entities_entity.js.html index 4e3728629..ac9df1cc0 100644 --- a/docs/backend_api/entities_entity.js.html +++ b/docs/backend_api/entities_entity.js.html @@ -93,7 +93,7 @@ module.exports = Entity;
diff --git a/docs/backend_api/entities_link.js.html b/docs/backend_api/entities_link.js.html index 856b63da5..82a6c7804 100644 --- a/docs/backend_api/entities_link.js.html +++ b/docs/backend_api/entities_link.js.html @@ -92,7 +92,7 @@ module.exports = Link;
diff --git a/docs/backend_api/entities_note.js.html b/docs/backend_api/entities_note.js.html index c3044d95f..f35313b7a 100644 --- a/docs/backend_api/entities_note.js.html +++ b/docs/backend_api/entities_note.js.html @@ -622,7 +622,7 @@ module.exports = Note;
diff --git a/docs/backend_api/entities_note_revision.js.html b/docs/backend_api/entities_note_revision.js.html index 6925798bb..8423fa335 100644 --- a/docs/backend_api/entities_note_revision.js.html +++ b/docs/backend_api/entities_note_revision.js.html @@ -91,7 +91,7 @@ module.exports = NoteRevision;
diff --git a/docs/backend_api/entities_option.js.html b/docs/backend_api/entities_option.js.html index de304d431..e0d78488a 100644 --- a/docs/backend_api/entities_option.js.html +++ b/docs/backend_api/entities_option.js.html @@ -78,7 +78,7 @@ module.exports = Option;
diff --git a/docs/backend_api/entities_recent_note.js.html b/docs/backend_api/entities_recent_note.js.html index 937f18f85..ca0c1cab0 100644 --- a/docs/backend_api/entities_recent_note.js.html +++ b/docs/backend_api/entities_recent_note.js.html @@ -75,7 +75,7 @@ module.exports = RecentNote;
diff --git a/docs/backend_api/global.html b/docs/backend_api/global.html index 84c6ab028..fa45b532d 100644 --- a/docs/backend_api/global.html +++ b/docs/backend_api/global.html @@ -594,7 +594,7 @@
diff --git a/docs/backend_api/index.html b/docs/backend_api/index.html index 76800ee58..d9146110d 100644 --- a/docs/backend_api/index.html +++ b/docs/backend_api/index.html @@ -56,7 +56,7 @@
diff --git a/docs/backend_api/services_backend_script_api.js.html b/docs/backend_api/services_backend_script_api.js.html index d283db72c..8857d5439 100644 --- a/docs/backend_api/services_backend_script_api.js.html +++ b/docs/backend_api/services_backend_script_api.js.html @@ -278,7 +278,7 @@ module.exports = BackendScriptApi;
diff --git a/docs/frontend_api/Branch.html b/docs/frontend_api/Branch.html index e98118fe1..9cb26a0de 100644 --- a/docs/frontend_api/Branch.html +++ b/docs/frontend_api/Branch.html @@ -719,7 +719,7 @@
diff --git a/docs/frontend_api/FrontendScriptApi.html b/docs/frontend_api/FrontendScriptApi.html index 8ef12bc77..c259cbc3d 100644 --- a/docs/frontend_api/FrontendScriptApi.html +++ b/docs/frontend_api/FrontendScriptApi.html @@ -2846,7 +2846,7 @@ Internally this serializes the anonymous function into string and sends it to ba
diff --git a/docs/frontend_api/NoteFull.html b/docs/frontend_api/NoteFull.html index 09c62a160..5a626119d 100644 --- a/docs/frontend_api/NoteFull.html +++ b/docs/frontend_api/NoteFull.html @@ -279,7 +279,7 @@
diff --git a/docs/frontend_api/NoteShort.html b/docs/frontend_api/NoteShort.html index 3ae4b0aec..a1fe24219 100644 --- a/docs/frontend_api/NoteShort.html +++ b/docs/frontend_api/NoteShort.html @@ -1316,7 +1316,7 @@ Its notable omission is the note content.
diff --git a/docs/frontend_api/entities_branch.js.html b/docs/frontend_api/entities_branch.js.html index 74826cdfb..636a5b374 100644 --- a/docs/frontend_api/entities_branch.js.html +++ b/docs/frontend_api/entities_branch.js.html @@ -76,7 +76,7 @@ export default Branch;
diff --git a/docs/frontend_api/entities_note_full.js.html b/docs/frontend_api/entities_note_full.js.html index 820bf364a..045ef4aee 100644 --- a/docs/frontend_api/entities_note_full.js.html +++ b/docs/frontend_api/entities_note_full.js.html @@ -64,7 +64,7 @@ export default NoteFull;
diff --git a/docs/frontend_api/entities_note_short.js.html b/docs/frontend_api/entities_note_short.js.html index 1a6cc0cd1..14ea8a0ef 100644 --- a/docs/frontend_api/entities_note_short.js.html +++ b/docs/frontend_api/entities_note_short.js.html @@ -128,7 +128,7 @@ export default NoteShort;
diff --git a/docs/frontend_api/global.html b/docs/frontend_api/global.html index 52cf8fb2e..cb112cfce 100644 --- a/docs/frontend_api/global.html +++ b/docs/frontend_api/global.html @@ -204,7 +204,7 @@ - name of the jQuery UI icon to be used (e.g. "clock" for "ui-icon-clock" icon) + name of the JAM icon to be used (e.g. "clock" for "jam-clock" icon) @@ -339,7 +339,7 @@
diff --git a/docs/frontend_api/index.html b/docs/frontend_api/index.html index cd41ca3e4..21ecb0409 100644 --- a/docs/frontend_api/index.html +++ b/docs/frontend_api/index.html @@ -56,7 +56,7 @@
diff --git a/docs/frontend_api/services_frontend_script_api.js.html b/docs/frontend_api/services_frontend_script_api.js.html index d45428a52..b13f21bba 100644 --- a/docs/frontend_api/services_frontend_script_api.js.html +++ b/docs/frontend_api/services_frontend_script_api.js.html @@ -75,7 +75,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null) { /** * @typedef {Object} ToolbarButtonOptions * @property {string} title - * @property {string} [icon] - name of the jQuery UI icon to be used (e.g. "clock" for "ui-icon-clock" icon) + * @property {string} [icon] - name of the JAM icon to be used (e.g. "clock" for "jam-clock" icon) * @property {function} action - callback handling the click on the button * @property {string} [shortcut] - keyboard shortcut for the button, e.g. "alt+t" */ @@ -89,7 +89,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null) { const buttonId = "toolbar-button-" + opts.title.replace(/[^a-zA-Z0-9]/g, "-"); const icon = $("<span>") - .addClass("ui-icon ui-icon-" + opts.icon); + .addClass("jam jam-" + opts.icon); const button = $('<button>') .addClass("btn btn-sm") @@ -269,7 +269,7 @@ export default FrontendScriptApi;
diff --git a/src/public/javascripts/services/tree_context_menu.js b/src/public/javascripts/services/tree_context_menu.js index 248aa45ff..a79a2222d 100644 --- a/src/public/javascripts/services/tree_context_menu.js +++ b/src/public/javascripts/services/tree_context_menu.js @@ -88,7 +88,7 @@ const contextMenuItems = [ {title: "Protect subtree", cmd: "protectSubtree", uiIcon: "shield-check"}, {title: "Unprotect subtree", cmd: "unprotectSubtree", uiIcon: "shield-close"}, {title: "----"}, - {title: "Copy / clone Ctrl+C", cmd: "copy", uiIcon: "save"}, + {title: "Copy / clone Ctrl+C", cmd: "copy", uiIcon: "files"}, {title: "Cut Ctrl+X", cmd: "cut", uiIcon: "scissors"}, {title: "Paste into Ctrl+V", cmd: "pasteInto", uiIcon: "clipboard"}, {title: "Paste after", cmd: "pasteAfter", uiIcon: "clipboard"}, diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css index 314dfec31..7520086dc 100644 --- a/src/public/stylesheets/style.css +++ b/src/public/stylesheets/style.css @@ -400,12 +400,6 @@ button.icon-button { padding: 2px; } -button.icon-button24 { - height: 32px; - width: 32px; - background: no-repeat center; -} - #note-actions { margin-left: 10px; margin-right: 10px; diff --git a/src/views/index.ejs b/src/views/index.ejs index 856f6d928..45e6707d9 100644 --- a/src/views/index.ejs +++ b/src/views/index.ejs @@ -8,11 +8,11 @@