diff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.json index 14d1aab31..8211e439b 100644 --- a/docs/User Guide/!!!meta.json +++ b/docs/User Guide/!!!meta.json @@ -9,7 +9,7 @@ "pOsGYCXsbNQG" ], "title": "User Guide", - "notePosition": 80, + "notePosition": 70, "prefix": null, "isExpanded": false, "type": "text", @@ -1024,21 +1024,21 @@ { "type": "relation", "name": "internalLink", - "value": "CdNpE2pqjmI6", + "value": "zEY4DaJG4YT5", "isInheritable": false, "position": 10 }, { "type": "relation", "name": "internalLink", - "value": "6f9hih2hXXZk", + "value": "CdNpE2pqjmI6", "isInheritable": false, "position": 20 }, { "type": "relation", "name": "internalLink", - "value": "zEY4DaJG4YT5", + "value": "6f9hih2hXXZk", "isInheritable": false, "position": 30 }, @@ -1642,25 +1642,25 @@ "position": 30 }, { - "type": "label", - "name": "iconClass", - "value": "bx bxs-layout", + "type": "relation", + "name": "internalLink", + "value": "x3i7MxGccDuM", "isInheritable": false, "position": 40 }, { "type": "relation", "name": "internalLink", - "value": "x3i7MxGccDuM", + "value": "_lbSettings", "isInheritable": false, "position": 50 }, { - "type": "relation", - "name": "internalLink", - "value": "_lbSettings", + "type": "label", + "name": "iconClass", + "value": "bx bxs-layout", "isInheritable": false, - "position": 60 + "position": 40 } ], "format": "markdown", @@ -1886,6 +1886,13 @@ "isInheritable": false, "position": 40 }, + { + "type": "relation", + "name": "internalLink", + "value": "ivYnonVFBxbQ", + "isInheritable": false, + "position": 50 + }, { "type": "label", "name": "shareAlias", @@ -1899,13 +1906,6 @@ "value": "bx bxs-tree-alt", "isInheritable": false, "position": 50 - }, - { - "type": "relation", - "name": "internalLink", - "value": "ivYnonVFBxbQ", - "isInheritable": false, - "position": 60 } ], "format": "markdown", @@ -1946,23 +1946,30 @@ "mime": "text/html", "attributes": [ { - "type": "label", - "name": "iconClass", - "value": "bx bx-sidebar", + "type": "relation", + "name": "internalLink", + "value": "x3i7MxGccDuM", "isInheritable": false, "position": 10 }, { "type": "relation", "name": "internalLink", - "value": "x3i7MxGccDuM", + "value": "p9kXRFAkwN4o", + "isInheritable": false, + "position": 20 + }, + { + "type": "relation", + "name": "internalLink", + "value": "OR8WJ7Iz9K4U", "isInheritable": false, "position": 30 }, { "type": "relation", "name": "internalLink", - "value": "oPVyFC7WL2Lp", + "value": "OFXdgB2nNk1F", "isInheritable": false, "position": 40 }, @@ -1976,37 +1983,30 @@ { "type": "relation", "name": "internalLink", - "value": "OR8WJ7Iz9K4U", + "value": "oPVyFC7WL2Lp", "isInheritable": false, - "position": 70 + "position": 60 }, { "type": "relation", "name": "internalLink", "value": "CdNpE2pqjmI6", "isInheritable": false, - "position": 80 + "position": 70 }, { "type": "relation", "name": "internalLink", "value": "SynTBQiBsdYJ", "isInheritable": false, - "position": 90 + "position": 80 }, { - "type": "relation", - "name": "internalLink", - "value": "OFXdgB2nNk1F", + "type": "label", + "name": "iconClass", + "value": "bx bx-sidebar", "isInheritable": false, - "position": 100 - }, - { - "type": "relation", - "name": "internalLink", - "value": "p9kXRFAkwN4o", - "isInheritable": false, - "position": 110 + "position": 10 } ], "format": "markdown", @@ -2211,14 +2211,14 @@ { "type": "relation", "name": "internalLink", - "value": "CdNpE2pqjmI6", + "value": "R7abl2fc6Mxi", "isInheritable": false, "position": 20 }, { "type": "relation", "name": "internalLink", - "value": "R7abl2fc6Mxi", + "value": "CdNpE2pqjmI6", "isInheritable": false, "position": 30 }, @@ -2522,21 +2522,21 @@ { "type": "relation", "name": "internalLink", - "value": "6f9hih2hXXZk", + "value": "zEY4DaJG4YT5", "isInheritable": false, "position": 10 }, { "type": "relation", "name": "internalLink", - "value": "zEY4DaJG4YT5", + "value": "iPIMuisry3hd", "isInheritable": false, "position": 20 }, { "type": "relation", "name": "internalLink", - "value": "iPIMuisry3hd", + "value": "6f9hih2hXXZk", "isInheritable": false, "position": 30 }, @@ -2900,28 +2900,28 @@ { "type": "relation", "name": "internalLink", - "value": "6f9hih2hXXZk", + "value": "MMiBEQljMQh2", "isInheritable": false, "position": 20 }, { "type": "relation", "name": "internalLink", - "value": "MMiBEQljMQh2", + "value": "IakOLONlIfGI", "isInheritable": false, "position": 30 }, { "type": "relation", "name": "internalLink", - "value": "IakOLONlIfGI", + "value": "iPIMuisry3hd", "isInheritable": false, "position": 40 }, { "type": "relation", "name": "internalLink", - "value": "iPIMuisry3hd", + "value": "6f9hih2hXXZk", "isInheritable": false, "position": 50 }, @@ -3435,14 +3435,21 @@ { "type": "relation", "name": "internalLink", - "value": "nRhnJkTT8cPs", + "value": "6f9hih2hXXZk", + "isInheritable": false, + "position": 10 + }, + { + "type": "relation", + "name": "internalLink", + "value": "4TIF1oA4VQRO", "isInheritable": false, "position": 20 }, { "type": "relation", "name": "internalLink", - "value": "4TIF1oA4VQRO", + "value": "nRhnJkTT8cPs", "isInheritable": false, "position": 30 }, @@ -3459,13 +3466,6 @@ "value": "bx bx-code", "isInheritable": false, "position": 50 - }, - { - "type": "relation", - "name": "internalLink", - "value": "6f9hih2hXXZk", - "isInheritable": false, - "position": 60 } ], "format": "markdown", @@ -3524,13 +3524,21 @@ "format": "markdown", "dataFileName": "Content language & Right-to-le.md", "attachments": [ + { + "attachmentId": "RlBpP2KTDVIK", + "title": "image.png", + "role": "image", + "mime": "image/jpg", + "position": 10, + "dataFileName": "Content language & Right-t.png" + }, { "attachmentId": "TlBagKsAj5ax", "title": "image.png", "role": "image", "mime": "image/png", "position": 10, - "dataFileName": "Content language & Right-t.png" + "dataFileName": "1_Content language & Right-t.png" }, { "attachmentId": "U9e8SLUEALiR", @@ -3538,7 +3546,60 @@ "role": "image", "mime": "image/png", "position": 10, - "dataFileName": "1_Content language & Right-t.png" + "dataFileName": "2_Content language & Right-t.png" + } + ] + }, + { + "isClone": false, + "noteId": "UYuUB1ZekNQU", + "notePath": [ + "pOsGYCXsbNQG", + "KSZ04uQ2D1St", + "iPIMuisry3hd", + "UYuUB1ZekNQU" + ], + "title": "Formatting", + "notePosition": 30, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/html", + "attributes": [ + { + "type": "relation", + "name": "internalLink", + "value": "nRhnJkTT8cPs", + "isInheritable": false, + "position": 10 + } + ], + "format": "markdown", + "dataFileName": "Formatting.md", + "attachments": [ + { + "attachmentId": "7tX4ckOSF8jq", + "title": "image.png", + "role": "image", + "mime": "image/jpg", + "position": 10, + "dataFileName": "Formatting_image.png" + }, + { + "attachmentId": "HP741oAz3ebU", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "1_Formatting_image.png" + }, + { + "attachmentId": "yKVC2F773Mg7", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "2_Formatting_image.png" } ] }, @@ -3552,7 +3613,7 @@ "nRhnJkTT8cPs" ], "title": "Formatting toolbar", - "notePosition": 30, + "notePosition": 40, "prefix": null, "isExpanded": false, "type": "text", @@ -3561,23 +3622,23 @@ { "type": "relation", "name": "internalLink", - "value": "BlN9DFI679QC", + "value": "4TIF1oA4VQRO", "isInheritable": false, "position": 10 }, + { + "type": "relation", + "name": "internalLink", + "value": "BlN9DFI679QC", + "isInheritable": false, + "position": 20 + }, { "type": "label", "name": "iconClass", "value": "bx bx-text", "isInheritable": false, "position": 20 - }, - { - "type": "relation", - "name": "internalLink", - "value": "4TIF1oA4VQRO", - "isInheritable": false, - "position": 30 } ], "format": "markdown", @@ -3627,7 +3688,7 @@ "mT0HEkOsz6i1" ], "title": "Images", - "notePosition": 40, + "notePosition": 50, "prefix": null, "isExpanded": false, "type": "text", @@ -3781,7 +3842,7 @@ "QEAPj01N5f7w" ], "title": "Links", - "notePosition": 50, + "notePosition": 60, "prefix": null, "isExpanded": false, "type": "text", @@ -3837,7 +3898,7 @@ "S6Xx8QIWTV66" ], "title": "Lists", - "notePosition": 60, + "notePosition": 70, "prefix": null, "isExpanded": false, "type": "text", @@ -3921,54 +3982,54 @@ "type": "text", "mime": "text/markdown", "attributes": [ - { - "type": "label", - "name": "shareAlias", - "value": "code-notes", - "isInheritable": false, - "position": 20 - }, { "type": "relation", "name": "internalLink", "value": "CdNpE2pqjmI6", "isInheritable": false, - "position": 30 + "position": 10 }, { "type": "relation", "name": "internalLink", "value": "iPIMuisry3hd", "isInheritable": false, - "position": 40 + "position": 20 }, { "type": "relation", "name": "internalLink", "value": "QxEyIjRBizuC", "isInheritable": false, - "position": 50 + "position": 30 }, { "type": "relation", "name": "internalLink", "value": "BlN9DFI679QC", "isInheritable": false, - "position": 60 + "position": 40 }, { "type": "relation", "name": "internalLink", "value": "4TIF1oA4VQRO", "isInheritable": false, - "position": 70 + "position": 50 }, { "type": "relation", "name": "internalLink", "value": "s8alTXmpFR61", "isInheritable": false, - "position": 80 + "position": 60 + }, + { + "type": "label", + "name": "shareAlias", + "value": "code-notes", + "isInheritable": false, + "position": 20 }, { "type": "label", @@ -4026,57 +4087,57 @@ "attributes": [ { "type": "relation", - "name": "internalLink", - "value": "6f9hih2hXXZk", + "name": "imageLink", + "value": "DVJl4l3T8EG2", "isInheritable": false, "position": 10 }, { "type": "relation", "name": "internalLink", - "value": "GLks18SNjxmC", + "value": "6f9hih2hXXZk", "isInheritable": false, "position": 20 }, { "type": "relation", "name": "internalLink", - "value": "zEY4DaJG4YT5", + "value": "GLks18SNjxmC", "isInheritable": false, "position": 30 }, { "type": "relation", "name": "internalLink", - "value": "5668rwcirq1t", + "value": "wX4HbRucYSDD", "isInheritable": false, "position": 40 }, { "type": "relation", "name": "internalLink", - "value": "GPERMystNGTB", + "value": "zEY4DaJG4YT5", "isInheritable": false, "position": 50 }, { "type": "relation", - "name": "imageLink", - "value": "DVJl4l3T8EG2", + "name": "internalLink", + "value": "RDslemsQ6gCp", "isInheritable": false, "position": 60 }, { "type": "relation", "name": "internalLink", - "value": "wX4HbRucYSDD", + "value": "5668rwcirq1t", "isInheritable": false, "position": 70 }, { "type": "relation", "name": "internalLink", - "value": "RDslemsQ6gCp", + "value": "GPERMystNGTB", "isInheritable": false, "position": 80 }, @@ -5204,14 +5265,14 @@ { "type": "relation", "name": "internalLink", - "value": "GLks18SNjxmC", + "value": "zEY4DaJG4YT5", "isInheritable": false, "position": 10 }, { "type": "relation", "name": "internalLink", - "value": "zEY4DaJG4YT5", + "value": "GLks18SNjxmC", "isInheritable": false, "position": 20 }, @@ -6166,14 +6227,14 @@ { "type": "relation", "name": "internalLink", - "value": "CdNpE2pqjmI6", + "value": "WOcw2SLH6tbX", "isInheritable": false, "position": 40 }, { "type": "relation", "name": "internalLink", - "value": "WOcw2SLH6tbX", + "value": "CdNpE2pqjmI6", "isInheritable": false, "position": 50 }, @@ -6425,35 +6486,35 @@ { "type": "relation", "name": "internalLink", - "value": "CdNpE2pqjmI6", + "value": "wX4HbRucYSDD", "isInheritable": false, "position": 10 }, { "type": "relation", "name": "internalLink", - "value": "wX4HbRucYSDD", + "value": "IakOLONlIfGI", "isInheritable": false, "position": 20 }, { "type": "relation", "name": "internalLink", - "value": "IakOLONlIfGI", + "value": "zEY4DaJG4YT5", "isInheritable": false, "position": 30 }, { "type": "relation", "name": "internalLink", - "value": "zEY4DaJG4YT5", + "value": "BCkXAVs63Ttv", "isInheritable": false, "position": 40 }, { "type": "relation", "name": "internalLink", - "value": "BCkXAVs63Ttv", + "value": "CdNpE2pqjmI6", "isInheritable": false, "position": 50 }, diff --git a/docs/User Guide/User Guide/Basic Concepts/UI Elements/Launch Bar.md b/docs/User Guide/User Guide/Basic Concepts/UI Elements/Launch Bar.md index d01048a5e..c5e4346cb 100644 --- a/docs/User Guide/User Guide/Basic Concepts/UI Elements/Launch Bar.md +++ b/docs/User Guide/User Guide/Basic Concepts/UI Elements/Launch Bar.md @@ -49,18 +49,17 @@ Right click either the _Available launchers_ or _Visible launchers_ sections and 1. Set the `target` promoted attribute to the note to navigate to. 2. Optionally, set `hoistedNote` to hoist a particular note. See [Note Hoisting](../Navigation/Note%20Hoisting.md) for more information. 3. Optionally, set a `keyboardShortcut` to trigger the launcher. - 2. **Script Launcher** An advanced launcher which will run a script upon pressing. See [Scripts](../../Note%20Types/Code/Scripts.md) for more information. 1. Set `script` to point to the desired script to run. 2. Optionally, set a `keyboardShortcut` to trigger the launcher. - 3. **Custom Widget** Allows defining a custom widget to be rendered inside the launcher. See [Widget Basics](../../Developer%20Guides/Widget%20Basics.md) for more information. 4. **Spacers** Launchers that create some distance between other launchers for better visual distinction. + Launchers are configured via predefined [Promoted Attributes](../../Advanced%20Usage/Attributes/Promoted%20Attributes.md). \ No newline at end of file diff --git a/docs/User Guide/User Guide/Note Types/Text/1_Content language & Right-t.png b/docs/User Guide/User Guide/Note Types/Text/1_Content language & Right-t.png index 8d05d2878..20864f8af 100644 Binary files a/docs/User Guide/User Guide/Note Types/Text/1_Content language & Right-t.png and b/docs/User Guide/User Guide/Note Types/Text/1_Content language & Right-t.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/1_Formatting_image.png b/docs/User Guide/User Guide/Note Types/Text/1_Formatting_image.png new file mode 100644 index 000000000..7ce00de3b Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/1_Formatting_image.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/2_Content language & Right-t.png b/docs/User Guide/User Guide/Note Types/Text/2_Content language & Right-t.png new file mode 100644 index 000000000..8d05d2878 Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/2_Content language & Right-t.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/2_Formatting_image.png b/docs/User Guide/User Guide/Note Types/Text/2_Formatting_image.png new file mode 100644 index 000000000..91902a381 Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/2_Formatting_image.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/Content language & Right-t.png b/docs/User Guide/User Guide/Note Types/Text/Content language & Right-t.png index 20864f8af..8e5d5a2f7 100644 Binary files a/docs/User Guide/User Guide/Note Types/Text/Content language & Right-t.png and b/docs/User Guide/User Guide/Note Types/Text/Content language & Right-t.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/Content language & Right-to-le.md b/docs/User Guide/User Guide/Note Types/Text/Content language & Right-to-le.md index c2b917bdf..7fbee885a 100644 --- a/docs/User Guide/User Guide/Note Types/Text/Content language & Right-to-le.md +++ b/docs/User Guide/User Guide/Note Types/Text/Content language & Right-to-le.md @@ -1,5 +1,5 @@ # Content language & Right-to-left support -![](1_Content%20language%20&%20Right-t.png) +![](Content%20language%20&%20Right-t.png) A language hint can be provided for text notes. This option informs the browser or the desktop application about the language the note is written in (for example this might help with spellchecking), and it also determines whether the text is displayed from right-to-left for languages such as Arabic, Hebrew, etc. diff --git a/docs/User Guide/User Guide/Note Types/Text/Formatting.md b/docs/User Guide/User Guide/Note Types/Text/Formatting.md new file mode 100644 index 000000000..005078eed --- /dev/null +++ b/docs/User Guide/User Guide/Note Types/Text/Formatting.md @@ -0,0 +1,10 @@ +# Formatting +## Developer-specific formatting + +### Keyboard shortcuts + +This allows marking a portion of text as a shortcut key. + +![](Formatting_image.png) + +To apply this style, press the ![](2_Formatting_image.png) button in ![](1_Formatting_image.png) group from the [Formatting toolbar](Formatting%20toolbar.md). On the floating toolbar, the buttons appear when selecting a text. \ No newline at end of file diff --git a/docs/User Guide/User Guide/Note Types/Text/Formatting_image.png b/docs/User Guide/User Guide/Note Types/Text/Formatting_image.png new file mode 100644 index 000000000..6ae0fd87a Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/Formatting_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/!!!meta.json b/src/public/app/doc_notes/en/User Guide/!!!meta.json index 494c14914..0b31f005f 100644 --- a/src/public/app/doc_notes/en/User Guide/!!!meta.json +++ b/src/public/app/doc_notes/en/User Guide/!!!meta.json @@ -9,7 +9,7 @@ "pOsGYCXsbNQG" ], "title": "User Guide", - "notePosition": 80, + "notePosition": 70, "prefix": null, "isExpanded": true, "type": "text", @@ -1024,21 +1024,21 @@ { "type": "relation", "name": "internalLink", - "value": "CdNpE2pqjmI6", + "value": "zEY4DaJG4YT5", "isInheritable": false, "position": 10 }, { "type": "relation", "name": "internalLink", - "value": "6f9hih2hXXZk", + "value": "CdNpE2pqjmI6", "isInheritable": false, "position": 20 }, { "type": "relation", "name": "internalLink", - "value": "zEY4DaJG4YT5", + "value": "6f9hih2hXXZk", "isInheritable": false, "position": 30 }, @@ -1552,7 +1552,7 @@ "title": "Basic Concepts", "notePosition": 60, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -1579,7 +1579,7 @@ "title": "UI Elements", "notePosition": 10, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [], @@ -1642,25 +1642,25 @@ "position": 30 }, { - "type": "label", - "name": "iconClass", - "value": "bx bxs-layout", + "type": "relation", + "name": "internalLink", + "value": "x3i7MxGccDuM", "isInheritable": false, "position": 40 }, { "type": "relation", "name": "internalLink", - "value": "x3i7MxGccDuM", + "value": "_lbSettings", "isInheritable": false, "position": 50 }, { - "type": "relation", - "name": "internalLink", - "value": "_lbSettings", + "type": "label", + "name": "iconClass", + "value": "bx bxs-layout", "isInheritable": false, - "position": 60 + "position": 40 } ], "format": "html", @@ -1886,6 +1886,13 @@ "isInheritable": false, "position": 40 }, + { + "type": "relation", + "name": "internalLink", + "value": "ivYnonVFBxbQ", + "isInheritable": false, + "position": 50 + }, { "type": "label", "name": "shareAlias", @@ -1899,13 +1906,6 @@ "value": "bx bxs-tree-alt", "isInheritable": false, "position": 50 - }, - { - "type": "relation", - "name": "internalLink", - "value": "ivYnonVFBxbQ", - "isInheritable": false, - "position": 60 } ], "format": "html", @@ -1946,23 +1946,30 @@ "mime": "text/html", "attributes": [ { - "type": "label", - "name": "iconClass", - "value": "bx bx-sidebar", + "type": "relation", + "name": "internalLink", + "value": "x3i7MxGccDuM", "isInheritable": false, "position": 10 }, { "type": "relation", "name": "internalLink", - "value": "x3i7MxGccDuM", + "value": "p9kXRFAkwN4o", + "isInheritable": false, + "position": 20 + }, + { + "type": "relation", + "name": "internalLink", + "value": "OR8WJ7Iz9K4U", "isInheritable": false, "position": 30 }, { "type": "relation", "name": "internalLink", - "value": "oPVyFC7WL2Lp", + "value": "OFXdgB2nNk1F", "isInheritable": false, "position": 40 }, @@ -1976,37 +1983,30 @@ { "type": "relation", "name": "internalLink", - "value": "OR8WJ7Iz9K4U", + "value": "oPVyFC7WL2Lp", "isInheritable": false, - "position": 70 + "position": 60 }, { "type": "relation", "name": "internalLink", "value": "CdNpE2pqjmI6", "isInheritable": false, - "position": 80 + "position": 70 }, { "type": "relation", "name": "internalLink", "value": "SynTBQiBsdYJ", "isInheritable": false, - "position": 90 + "position": 80 }, { - "type": "relation", - "name": "internalLink", - "value": "OFXdgB2nNk1F", + "type": "label", + "name": "iconClass", + "value": "bx bx-sidebar", "isInheritable": false, - "position": 100 - }, - { - "type": "relation", - "name": "internalLink", - "value": "p9kXRFAkwN4o", - "isInheritable": false, - "position": 110 + "position": 10 } ], "format": "html", @@ -2063,7 +2063,7 @@ "title": "Note", "notePosition": 40, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/markdown", "attributes": [ @@ -2211,14 +2211,14 @@ { "type": "relation", "name": "internalLink", - "value": "CdNpE2pqjmI6", + "value": "R7abl2fc6Mxi", "isInheritable": false, "position": 20 }, { "type": "relation", "name": "internalLink", - "value": "R7abl2fc6Mxi", + "value": "CdNpE2pqjmI6", "isInheritable": false, "position": 30 }, @@ -2522,21 +2522,21 @@ { "type": "relation", "name": "internalLink", - "value": "6f9hih2hXXZk", + "value": "zEY4DaJG4YT5", "isInheritable": false, "position": 10 }, { "type": "relation", "name": "internalLink", - "value": "zEY4DaJG4YT5", + "value": "iPIMuisry3hd", "isInheritable": false, "position": 20 }, { "type": "relation", "name": "internalLink", - "value": "iPIMuisry3hd", + "value": "6f9hih2hXXZk", "isInheritable": false, "position": 30 }, @@ -2900,28 +2900,28 @@ { "type": "relation", "name": "internalLink", - "value": "6f9hih2hXXZk", + "value": "MMiBEQljMQh2", "isInheritable": false, "position": 20 }, { "type": "relation", "name": "internalLink", - "value": "MMiBEQljMQh2", + "value": "IakOLONlIfGI", "isInheritable": false, "position": 30 }, { "type": "relation", "name": "internalLink", - "value": "IakOLONlIfGI", + "value": "iPIMuisry3hd", "isInheritable": false, "position": 40 }, { "type": "relation", "name": "internalLink", - "value": "iPIMuisry3hd", + "value": "6f9hih2hXXZk", "isInheritable": false, "position": 50 }, @@ -3435,14 +3435,21 @@ { "type": "relation", "name": "internalLink", - "value": "nRhnJkTT8cPs", + "value": "6f9hih2hXXZk", + "isInheritable": false, + "position": 10 + }, + { + "type": "relation", + "name": "internalLink", + "value": "4TIF1oA4VQRO", "isInheritable": false, "position": 20 }, { "type": "relation", "name": "internalLink", - "value": "4TIF1oA4VQRO", + "value": "nRhnJkTT8cPs", "isInheritable": false, "position": 30 }, @@ -3459,13 +3466,6 @@ "value": "bx bx-code", "isInheritable": false, "position": 50 - }, - { - "type": "relation", - "name": "internalLink", - "value": "6f9hih2hXXZk", - "isInheritable": false, - "position": 60 } ], "format": "html", @@ -3524,13 +3524,21 @@ "format": "html", "dataFileName": "Content language & Right-to-le.html", "attachments": [ + { + "attachmentId": "RlBpP2KTDVIK", + "title": "image.png", + "role": "image", + "mime": "image/jpg", + "position": 10, + "dataFileName": "Content language & Right-t.png" + }, { "attachmentId": "TlBagKsAj5ax", "title": "image.png", "role": "image", "mime": "image/png", "position": 10, - "dataFileName": "Content language & Right-t.png" + "dataFileName": "1_Content language & Right-t.png" }, { "attachmentId": "U9e8SLUEALiR", @@ -3538,7 +3546,60 @@ "role": "image", "mime": "image/png", "position": 10, - "dataFileName": "1_Content language & Right-t.png" + "dataFileName": "2_Content language & Right-t.png" + } + ] + }, + { + "isClone": false, + "noteId": "UYuUB1ZekNQU", + "notePath": [ + "pOsGYCXsbNQG", + "KSZ04uQ2D1St", + "iPIMuisry3hd", + "UYuUB1ZekNQU" + ], + "title": "Formatting", + "notePosition": 30, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/html", + "attributes": [ + { + "type": "relation", + "name": "internalLink", + "value": "nRhnJkTT8cPs", + "isInheritable": false, + "position": 10 + } + ], + "format": "html", + "dataFileName": "Formatting.html", + "attachments": [ + { + "attachmentId": "7tX4ckOSF8jq", + "title": "image.png", + "role": "image", + "mime": "image/jpg", + "position": 10, + "dataFileName": "Formatting_image.png" + }, + { + "attachmentId": "HP741oAz3ebU", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "1_Formatting_image.png" + }, + { + "attachmentId": "yKVC2F773Mg7", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "2_Formatting_image.png" } ] }, @@ -3552,7 +3613,7 @@ "nRhnJkTT8cPs" ], "title": "Formatting toolbar", - "notePosition": 30, + "notePosition": 40, "prefix": null, "isExpanded": false, "type": "text", @@ -3561,23 +3622,23 @@ { "type": "relation", "name": "internalLink", - "value": "BlN9DFI679QC", + "value": "4TIF1oA4VQRO", "isInheritable": false, "position": 10 }, + { + "type": "relation", + "name": "internalLink", + "value": "BlN9DFI679QC", + "isInheritable": false, + "position": 20 + }, { "type": "label", "name": "iconClass", "value": "bx bx-text", "isInheritable": false, "position": 20 - }, - { - "type": "relation", - "name": "internalLink", - "value": "4TIF1oA4VQRO", - "isInheritable": false, - "position": 30 } ], "format": "html", @@ -3627,7 +3688,7 @@ "mT0HEkOsz6i1" ], "title": "Images", - "notePosition": 40, + "notePosition": 50, "prefix": null, "isExpanded": false, "type": "text", @@ -3781,7 +3842,7 @@ "QEAPj01N5f7w" ], "title": "Links", - "notePosition": 50, + "notePosition": 60, "prefix": null, "isExpanded": false, "type": "text", @@ -3837,7 +3898,7 @@ "S6Xx8QIWTV66" ], "title": "Lists", - "notePosition": 60, + "notePosition": 70, "prefix": null, "isExpanded": false, "type": "text", @@ -3921,54 +3982,54 @@ "type": "text", "mime": "text/markdown", "attributes": [ - { - "type": "label", - "name": "shareAlias", - "value": "code-notes", - "isInheritable": false, - "position": 20 - }, { "type": "relation", "name": "internalLink", "value": "CdNpE2pqjmI6", "isInheritable": false, - "position": 30 + "position": 10 }, { "type": "relation", "name": "internalLink", "value": "iPIMuisry3hd", "isInheritable": false, - "position": 40 + "position": 20 }, { "type": "relation", "name": "internalLink", "value": "QxEyIjRBizuC", "isInheritable": false, - "position": 50 + "position": 30 }, { "type": "relation", "name": "internalLink", "value": "BlN9DFI679QC", "isInheritable": false, - "position": 60 + "position": 40 }, { "type": "relation", "name": "internalLink", "value": "4TIF1oA4VQRO", "isInheritable": false, - "position": 70 + "position": 50 }, { "type": "relation", "name": "internalLink", "value": "s8alTXmpFR61", "isInheritable": false, - "position": 80 + "position": 60 + }, + { + "type": "label", + "name": "shareAlias", + "value": "code-notes", + "isInheritable": false, + "position": 20 }, { "type": "label", @@ -4026,57 +4087,57 @@ "attributes": [ { "type": "relation", - "name": "internalLink", - "value": "6f9hih2hXXZk", + "name": "imageLink", + "value": "DVJl4l3T8EG2", "isInheritable": false, "position": 10 }, { "type": "relation", "name": "internalLink", - "value": "GLks18SNjxmC", + "value": "6f9hih2hXXZk", "isInheritable": false, "position": 20 }, { "type": "relation", "name": "internalLink", - "value": "zEY4DaJG4YT5", + "value": "GLks18SNjxmC", "isInheritable": false, "position": 30 }, { "type": "relation", "name": "internalLink", - "value": "5668rwcirq1t", + "value": "wX4HbRucYSDD", "isInheritable": false, "position": 40 }, { "type": "relation", "name": "internalLink", - "value": "GPERMystNGTB", + "value": "zEY4DaJG4YT5", "isInheritable": false, "position": 50 }, { "type": "relation", - "name": "imageLink", - "value": "DVJl4l3T8EG2", + "name": "internalLink", + "value": "RDslemsQ6gCp", "isInheritable": false, "position": 60 }, { "type": "relation", "name": "internalLink", - "value": "wX4HbRucYSDD", + "value": "5668rwcirq1t", "isInheritable": false, "position": 70 }, { "type": "relation", "name": "internalLink", - "value": "RDslemsQ6gCp", + "value": "GPERMystNGTB", "isInheritable": false, "position": 80 }, @@ -5204,14 +5265,14 @@ { "type": "relation", "name": "internalLink", - "value": "GLks18SNjxmC", + "value": "zEY4DaJG4YT5", "isInheritable": false, "position": 10 }, { "type": "relation", "name": "internalLink", - "value": "zEY4DaJG4YT5", + "value": "GLks18SNjxmC", "isInheritable": false, "position": 20 }, @@ -6166,14 +6227,14 @@ { "type": "relation", "name": "internalLink", - "value": "CdNpE2pqjmI6", + "value": "WOcw2SLH6tbX", "isInheritable": false, "position": 40 }, { "type": "relation", "name": "internalLink", - "value": "WOcw2SLH6tbX", + "value": "CdNpE2pqjmI6", "isInheritable": false, "position": 50 }, @@ -6425,35 +6486,35 @@ { "type": "relation", "name": "internalLink", - "value": "CdNpE2pqjmI6", + "value": "wX4HbRucYSDD", "isInheritable": false, "position": 10 }, { "type": "relation", "name": "internalLink", - "value": "wX4HbRucYSDD", + "value": "IakOLONlIfGI", "isInheritable": false, "position": 20 }, { "type": "relation", "name": "internalLink", - "value": "IakOLONlIfGI", + "value": "zEY4DaJG4YT5", "isInheritable": false, "position": 30 }, { "type": "relation", "name": "internalLink", - "value": "zEY4DaJG4YT5", + "value": "BCkXAVs63Ttv", "isInheritable": false, "position": 40 }, { "type": "relation", "name": "internalLink", - "value": "BCkXAVs63Ttv", + "value": "CdNpE2pqjmI6", "isInheritable": false, "position": 50 }, diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Content language & Right-t.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Content language & Right-t.png index 8d05d2878..20864f8af 100644 Binary files a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Content language & Right-t.png and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Content language & Right-t.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Formatting_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Formatting_image.png new file mode 100644 index 000000000..7ce00de3b Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Formatting_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Content language & Right-t.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Content language & Right-t.png new file mode 100644 index 000000000..8d05d2878 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Content language & Right-t.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Formatting_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Formatting_image.png new file mode 100644 index 000000000..91902a381 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Formatting_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Code blocks.html b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Code blocks.html index 4c687098e..0af3369df 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Code blocks.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Code blocks.html @@ -13,20 +13,20 @@

Code blocks

-
- -
+

+ +

The code blocks feature allows entering pieces of code in text notes.

Note that this feature is meant for generally small snippets of code. - For larger files such as an entire log, see the dedicated [missing note] note + For larger files such as an entire log, see the dedicated [missing note] note type instead.

-

Inserting a code block

+ +

Inserting a code block

+ -

Syntax highlighting

+ +

Syntax highlighting

+

Since TriliumNext v0.90.12, Trilium will try to offer syntax highlighting to the code block. Note that the syntax highlighting mechanism is slightly - different than the one in Code Notes notes + different than the one in Code Notes notes as different technologies are involved.

-

When the language is set to Auto-detected, Trilium will try to identify - the programming language (or similar) that corresponds to the given snippet - of text and highlight it. If this is problematic, consider changing the - language of the code block manually.

-

When the language is set to Plain text, there will be no syntax +

When the language is set to Auto-detected, Trilium will try to + identify the programming language (or similar) that corresponds to the + given snippet of text and highlight it. If this is problematic, consider + changing the language of the code block manually.

+

When the language is set to Plain text, there will be no syntax highlighting.

-

Changing the language of a code block

+ +

Changing the language of a code block

+

Simply click anywhere inside the code block and press again the code block - button in the Formatting toolbar: -
- + button in the Formatting toolbar: +
+

-

Adjusting the list of languages

+ +

Adjusting the list of languages

+

The code blocks feature shares the list of languages with the  Code Notes note type.

-

The supported languages can be adjusted by going to Options, then Code Notes and - looking for the Available MIME types in the dropdown section. Simply - check any of the items to add them to the list, or uncheck them to remove - them from the list.

+ href="../Code.html">Code Notes note type.

+

The supported languages can be adjusted by going to Options, + then Code Notes and looking for the Available MIME types in the dropdown section. + Simply check any of the items to add them to the list, or uncheck them + to remove them from the list.

Note that the list of languages is not immediately refreshed, you'd have to manually refresh the application.

-

 

diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language & Right-t.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language & Right-t.png index 20864f8af..8e5d5a2f7 100644 Binary files a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language & Right-t.png and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language & Right-t.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language & Right-to-le.html b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language & Right-to-le.html index dfbec8d21..231ee07a2 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language & Right-to-le.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language & Right-to-le.html @@ -13,10 +13,12 @@

Content language & Right-to-left support

-
- -
+
+
+ +
+

A language hint can be provided for text notes. This option informs the browser or the desktop application about the language the note is written in (for example this might help with spellchecking), and it also determines diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Formatting toolbar.html b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Formatting toolbar.html index df83c4b4e..f0c6d4577 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Formatting toolbar.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Formatting toolbar.html @@ -15,44 +15,51 @@

Trilium allows two different editing experiences for text notes, based on your preference.

-

To do so, go to Options and - look for the Text Notes section. There is a corresponding section - called Formatting toolbar.

-

Floating

+

To do so, go to Options and + look for the Text Notes section. There is a corresponding section + called Formatting toolbar.

+ +

Floating

+

The floating bar is a more minimalist option, in which the formatting is hidden behind two different popups.

-

Block-level popup

+ +

Block-level popup

+

The first popup is the block-level popup. This will appear to the left of the current paragraph you are currently editing, as a sequence of dots: -
- +
+

Clicking this popup will reveal the formatting options that are specific to the entire paragraph, such as setting a heading, lists, tables, etc.

- +

-

Inline popup

+ +

Inline popup

+

The inline popup appears automatically when selecting a text:

- +

All the options here apply only to the selected portion of text, such as changing the font size, or making the text bold.

-

Fixed

+ +

Fixed

+

The fixed formatting offers a more traditional editing paradigm, usually useful if a lot of formatting is needed.

All the options are combined into a single toolbar that will appear as - part of the Ribbon.

-
- -
-

By default, if the toolbar does not fit on the screen, the rest of the - options will be grouped into a single option at the end. It is possible - to display items on multiple lines by checking the corresponding option - in the Formatting toolbar section.

+ part of the Ribbon.

+

+ +

+

By default, if the toolbar does not fit on the screen, the rest of the + options will be grouped into a single option at the end. It is possible + to display items on multiple lines by checking the corresponding option + in the Formatting toolbar section.

diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Formatting.html b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Formatting.html new file mode 100644 index 000000000..33753ab5e --- /dev/null +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Formatting.html @@ -0,0 +1,32 @@ + + + + + + + + Formatting + + + +
+

Formatting

+ +
+

Developer-specific formatting

+

Keyboard shortcuts

+

This allows marking a portion of text as a shortcut key.

+
+ +
+

To apply this style, press the + button in + group from the Formatting toolbar. + On the floating toolbar, the buttons appear when selecting a text.

+
+
+ + + \ No newline at end of file diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Formatting_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Formatting_image.png new file mode 100644 index 000000000..6ae0fd87a Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Formatting_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Images.html b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Images.html index 4848b064d..2f046bf40 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Images.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Images.html @@ -20,112 +20,98 @@ into the note tree. Its reference can be copied into a text note, in order to display it in the text itself.

-

Uploading images

+ +

Uploading images

+

To add an image to the note, simply drag it from file explorer onto the note editor inside Trilium and the image will be uploaded.

- +

Alternatively you can click on block toolbar and then on "Insert image":

- +

You can also copy and paste an image from web - the image will be (asynchronously) downloaded and embedded.

-

Configuring the images

+ +

Configuring the images

+

Clicking on an image will reveal a popup with multiple options: -
- +
+

-

Alignment

+ +

Alignment

+

The first set of options configure the alignment are, in order:

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
IconOptionPreviewDescription
- - Inline -
- -
-
As the name suggests, the name can be put inside a paragraph and moved - around similarly as if it was a block of text. Use drag & drop or cut-paste - to move it around.
- - Centered image -
- -
-
The image will be displayed as a block and centered, not allowing text - in either the left or right of it.
- - Wrap text -
- -
-

 

-
The image will be displayed to the left or the right of the text.
- - Block align -
- -
-
Similarly to Centered image, the image will be displayed as a block - and aligned either to the left or to the right, but not allowing text to - flow on either of its sides.
-
-

Compression

-

Since Trilium isn't really meant to be primary storage for image data, - it attempts to compress and resize (with pretty aggressive settings) uploaded - images before storing them to the database. You may then notice some quality - degradation. Basic quality settings is available in Options -> Other.

-

If you want to save images in their original resolution, it is recommended - to save them as attachment to note (top-right "Note actions -> Import - files").

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IconOptionPreviewDescription
+ + Inline + + As the name suggests, the name can be put inside a paragraph and moved + around similarly as if it was a block of text. Use drag & drop or cut-paste + to move it around.
+ + Centered image + + The image will be displayed as a block and centered, not allowing text + in either the left or right of it.
+ + Wrap text + + The image will be displayed to the left or the right of the text.
+ + Block align + + Similarly to Centered image, the image will be displayed as a + block and aligned either to the left or to the right, but not allowing + text to flow on either of its sides.
+ +

Compression

+ +

Since Trilium isn't really meant to be primary storage for image data, + it attempts to compress and resize (with pretty aggressive settings) uploaded + images before storing them to the database. You may then notice some quality + degradation. Basic quality settings is available in Options -> Other.

+

If you want to save images in their original resolution, it is recommended + to save them as attachment to note (top-right "Note actions -> Import + files").

diff --git a/src/public/app/doc_notes/en/User Guide/navigation.html b/src/public/app/doc_notes/en/User Guide/navigation.html index dc34e2016..5995e9c65 100644 --- a/src/public/app/doc_notes/en/User Guide/navigation.html +++ b/src/public/app/doc_notes/en/User Guide/navigation.html @@ -178,6 +178,8 @@
  • Content language & Right-to-left support
  • +
  • Formatting +
  • Formatting toolbar
  • Images