diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/10_Tables_image.png b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/10_Tables_image.png index 5cf2cc519..099b25357 100644 Binary files a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/10_Tables_image.png and b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/10_Tables_image.png differ diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/11_Tables_image.png b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/11_Tables_image.png index cde63c9ac..5cf2cc519 100644 Binary files a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/11_Tables_image.png and b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/11_Tables_image.png differ diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/12_Tables_image.png b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/12_Tables_image.png index 9c512ee53..cde63c9ac 100644 Binary files a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/12_Tables_image.png and b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/12_Tables_image.png differ diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/13_Tables_image.png b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/13_Tables_image.png new file mode 100644 index 000000000..9c512ee53 Binary files /dev/null and b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/13_Tables_image.png differ diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/14_Tables_image.png b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/14_Tables_image.png new file mode 100644 index 000000000..dd4becc16 Binary files /dev/null and b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/14_Tables_image.png differ diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/9_Tables_image.png b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/9_Tables_image.png index 099b25357..e80215476 100644 Binary files a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/9_Tables_image.png and b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/9_Tables_image.png differ diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Tables.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Tables.html index a92fce632..c5bccc0df 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Tables.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Tables.html @@ -8,147 +8,182 @@ the desired amount of columns and rows, as indicated in the adjacent figure.
When a table is selected, a special formatting toolbar will appear:
-
+  
+
To merge two or more cells together, simply select them via drag &
+  drop and press the
+  
button from the formatting toolbar.
More options are available by pressing the arrow next to it:
+
+The table properties can be accessed via the
+  
button and allows for the following adjustments:
%)
+    or pixels (must end with px).To merge two or more cells together, simply select them via drag &
-    drop and press the
-    
button from the formatting toolbar.
More options are available by pressing the arrow next to it:
-
-  The table properties can be accessed via the
-    
button and allows for the following adjustments:
%)
-      or pixels (must end with px).The table will immediately update to reflect the changes, but the Save button - must be pressed for the changes to persist.
-
-  Similarly to table properties, the
-    
button opens a popup which adjusts the styling of one or more cells (based
-    on the user's selection).
The following options can be adjusted:
-%)
-      or pixels (must end with px).The cell will immediately update to reflect the changes, but the Save button - must be pressed for the changes to persist.
-Press the
-    
button to insert a caption or a text description of the table, which is
-    going to be displayed above the table.
Tables can be set to have invisible borders in order to allow for basic - layouts (columns, grids) of text or images without - the distraction of their border:
-The table will immediately update to reflect the changes, but the Save button + must be pressed for the changes to persist.
+
+Similarly to table properties, the
+  
button opens a popup which adjusts the styling of one or more cells (based
+  on the user's selection).
The following options can be adjusted:
+%)
+    or pixels (must end with px).The cell will immediately update to reflect the changes, but the Save button + must be pressed for the changes to persist.
+Press the
+  
button to insert a caption or a text description of the table, which is
+  going to be displayed above the table.
By default, tables will come with a predefined gray border.
+To adjust the borders, follow these steps:
+Tables can be set to have invisible borders in order to allow for basic + layouts (columns, grids) of text or images without + the distraction of their border:
+transparent
+        transparent
         1px.1px.Simple tables are exported in GitHub-flavored Markdown format (e.g. a
-    series of | items). If the table is found to be more complex
-    (it contains HTML elements, has custom sizes or images), the table is converted
-    to a HTML one instead.
Generally formatting loss should be minimal when exported to Markdown - due to the fallback to HTML formatting.
\ No newline at end of file +Simple tables are exported in GitHub-flavored Markdown format (e.g. a
+  series of | items). If the table is found to be more complex
+  (it contains HTML elements, has custom sizes or images), the table is converted
+  to a HTML one instead.
Generally formatting loss should be minimal when exported to Markdown + due to the fallback to HTML formatting.
\ No newline at end of file diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Scripting/Script API.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Scripting/Script API.html index 25b181b48..f83febe85 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Scripting/Script API.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Scripting/Script API.html @@ -1,10 +1,10 @@ -For script code notes, Trilium offers +
tFor script code notes, Trilium offers an API that gives them access to various features of the application.
There are two APIs:
In both cases, the API resides in a global variable, api,
diff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.json
index b910b2b97..eb00035ea 100644
--- a/docs/User Guide/!!!meta.json	
+++ b/docs/User Guide/!!!meta.json	
@@ -8281,7 +8281,7 @@
                                             "dataFileName": "8_Tables_image.png"
                                         },
                                         {
-                                            "attachmentId": "UdhsypjV4pzZ",
+                                            "attachmentId": "rrLM5BQCZ5ci",
                                             "title": "image.png",
                                             "role": "image",
                                             "mime": "image/png",
@@ -8289,7 +8289,7 @@
                                             "dataFileName": "9_Tables_image.png"
                                         },
                                         {
-                                            "attachmentId": "VerzwlO9y6Na",
+                                            "attachmentId": "UdhsypjV4pzZ",
                                             "title": "image.png",
                                             "role": "image",
                                             "mime": "image/png",
@@ -8297,7 +8297,7 @@
                                             "dataFileName": "10_Tables_image.png"
                                         },
                                         {
-                                            "attachmentId": "wYkQvargZlNF",
+                                            "attachmentId": "VerzwlO9y6Na",
                                             "title": "image.png",
                                             "role": "image",
                                             "mime": "image/png",
@@ -8305,12 +8305,28 @@
                                             "dataFileName": "11_Tables_image.png"
                                         },
                                         {
-                                            "attachmentId": "YFGeAN41kvZY",
+                                            "attachmentId": "wYkQvargZlNF",
                                             "title": "image.png",
                                             "role": "image",
                                             "mime": "image/png",
                                             "position": 10,
                                             "dataFileName": "12_Tables_image.png"
+                                        },
+                                        {
+                                            "attachmentId": "YFGeAN41kvZY",
+                                            "title": "image.png",
+                                            "role": "image",
+                                            "mime": "image/png",
+                                            "position": 10,
+                                            "dataFileName": "13_Tables_image.png"
+                                        },
+                                        {
+                                            "attachmentId": "zRLxHrKJiK8N",
+                                            "title": "image.png",
+                                            "role": "image",
+                                            "mime": "image/png",
+                                            "position": 10,
+                                            "dataFileName": "14_Tables_image.png"
                                         }
                                     ]
                                 }
diff --git a/docs/User Guide/User Guide/Note Types/Text/10_Tables_image.png b/docs/User Guide/User Guide/Note Types/Text/10_Tables_image.png
index 5cf2cc519..099b25357 100644
Binary files a/docs/User Guide/User Guide/Note Types/Text/10_Tables_image.png and b/docs/User Guide/User Guide/Note Types/Text/10_Tables_image.png differ
diff --git a/docs/User Guide/User Guide/Note Types/Text/11_Tables_image.png b/docs/User Guide/User Guide/Note Types/Text/11_Tables_image.png
index cde63c9ac..5cf2cc519 100644
Binary files a/docs/User Guide/User Guide/Note Types/Text/11_Tables_image.png and b/docs/User Guide/User Guide/Note Types/Text/11_Tables_image.png differ
diff --git a/docs/User Guide/User Guide/Note Types/Text/12_Tables_image.png b/docs/User Guide/User Guide/Note Types/Text/12_Tables_image.png
index 9c512ee53..cde63c9ac 100644
Binary files a/docs/User Guide/User Guide/Note Types/Text/12_Tables_image.png and b/docs/User Guide/User Guide/Note Types/Text/12_Tables_image.png differ
diff --git a/docs/User Guide/User Guide/Note Types/Text/13_Tables_image.png b/docs/User Guide/User Guide/Note Types/Text/13_Tables_image.png
new file mode 100644
index 000000000..9c512ee53
Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/13_Tables_image.png differ
diff --git a/docs/User Guide/User Guide/Note Types/Text/14_Tables_image.png b/docs/User Guide/User Guide/Note Types/Text/14_Tables_image.png
new file mode 100644
index 000000000..dd4becc16
Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/14_Tables_image.png differ
diff --git a/docs/User Guide/User Guide/Note Types/Text/9_Tables_image.png b/docs/User Guide/User Guide/Note Types/Text/9_Tables_image.png
index 099b25357..e80215476 100644
Binary files a/docs/User Guide/User Guide/Note Types/Text/9_Tables_image.png and b/docs/User Guide/User Guide/Note Types/Text/9_Tables_image.png differ
diff --git a/docs/User Guide/User Guide/Note Types/Text/Tables.md b/docs/User Guide/User Guide/Note Types/Text/Tables.md
index 88003853e..9944f4277 100644
--- a/docs/User Guide/User Guide/Note Types/Text/Tables.md	
+++ b/docs/User Guide/User Guide/Note Types/Text/Tables.md	
@@ -9,13 +9,13 @@ To create a table, simply press the table button and select with the mouse the d
 
 When a table is selected, a special formatting toolbar will appear:
 
-
+
 
 ## Navigating a table
 
 *   Using the mouse:
     *   Click on a cell to focus it.
-    *   Click the 
 button at the top or the bottom of a table to insert an empty paragraph near it.
+    *   Click the 
 button at the top or the bottom of a table to insert an empty paragraph near it.
     *   Click the 
 button at the top-left of the table to select it entirely (for easy copy-pasting or cutting) or drag and drop it to relocate the table.
 *   Using the keyboard:
     *   Use the arrow keys on the keyboard to easily navigate between cells.
@@ -48,7 +48,7 @@ More options are available by pressing the arrow next to it:
 
 
 button and allows for the following adjustments:
+The table properties can be accessed via the 
 button and allows for the following adjustments:
 
 *   Border (not the border of the cells, but the outer rim of the table), which includes the style (single, double), color and width.
 *   The background color, with none set by default.
@@ -63,7 +63,7 @@ The table will immediately update to reflect the changes, but the _Save_ button
 
 
 button opens a popup which adjusts the styling of one or more cells (based on the user's selection).
+Similarly to table properties, the 
 button opens a popup which adjusts the styling of one or more cells (based on the user's selection).
 
 The following options can be adjusted:
 
@@ -79,7 +79,25 @@ The cell will immediately update to reflect the changes, but the _Save_ button m
 
 Press the 
 button to insert a caption or a text description of the table, which is going to be displayed above the table.
 
-## Tables with invisible borders
+## Table borders
+
+By default, tables will come with a predefined gray border.
+
+To adjust the borders, follow these steps:
+
+1.  Select the table.
+2.  In the floating panel, select the _Table properties_ option (
).
+    1.  Look for the _Border_ section at the top of the newly opened panel.
+    2.  This will control the outer borders of the table.
+    3.  Select a style for the border. Generally _Single_ is the desirable option.
+    4.  Select a color for the border.
+    5.  Select a width for the border, expressed in pixels.
+3.  Select all the cells of the table and then press the _Cell properties_ option (
).
+    1.  This will control the inner borders of the table, at cell level.
+    2.  Note that it's possible to change the borders individually by selecting one or more cells, case in which it will only change the borders that intersect these cells.
+    3.  Repeat the same steps as from step (2).
+
+### Tables with invisible borders
 
 Tables can be set to have invisible borders in order to allow for basic layouts (columns, grids) of text or [images](Images.md) without the distraction of their border:
 
diff --git a/docs/User Guide/User Guide/Scripting/Script API.md b/docs/User Guide/User Guide/Scripting/Script API.md
index cb470e28e..3739cd532 100644
--- a/docs/User Guide/User Guide/Scripting/Script API.md	
+++ b/docs/User Guide/User Guide/Scripting/Script API.md	
@@ -1,5 +1,5 @@
 # Script API
-For [script code notes](../Scripting.md), Trilium offers an API that gives them access to various features of the application.
+tFor [script code notes](../Scripting.md), Trilium offers an API that gives them access to various features of the application.
 
 There are two APIs: