Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
client/text editor/multicolumn layout: update the icon of the "remove layout" button from the widget's toolbar
Adorian Dorand94e305bcbbd
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Multicolumn layout.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Multicolumn layout.htmlindex 4bd9926f2b..bd8e03aac7 100644--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Multicolumn layout.html+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Multicolumn layout.html@@ -50,7 +50,7 @@</ul><h2>Removing a layout</h2><ul>- <li>To remove the layout but keep its content, click the <span class="tn-icon cke cke-cancel"></span> <em>Remove layout</em> button+ <li>To remove the layout but keep its content, click the <span class="tn-icon cke cke-remove"></span> <em>Remove layout</em> buttonin the layout's toolbar. The content of the columns is placed one afteranother where the layout was, and empty columns are left out.</li><li>To delete the layout together with its content, click the handle at itsdiff --git a/docs/User Guide/User Guide/Note Types/Text/Multicolumn layout.md b/docs/User Guide/User Guide/Note Types/Text/Multicolumn layout.mdindex 02404a4627..bcbb85ca69 100644--- a/docs/User Guide/User Guide/Note Types/Text/Multicolumn layout.md+++ b/docs/User Guide/User Guide/Note Types/Text/Multicolumn layout.md@@ -25,7 +25,7 @@ While the cursor is inside a layout, a toolbar appears above it with a button th## Removing a layout-* To remove the layout but keep its content, click the <span class="tn-icon cke cke-cancel"></span> _Remove layout_ button in the layout's toolbar. The content of the columns is placed one after another where the layout was, and empty columns are left out.+* To remove the layout but keep its content, click the <span class="tn-icon cke cke-remove"></span> _Remove layout_ button in the layout's toolbar. The content of the columns is placed one after another where the layout was, and empty columns are left out.* To delete the layout together with its content, click the handle at its top-left corner to select it, then press <kbd>Delete</kbd>.## Narrow screensdiff --git a/packages/ckeditor5/src/plugins/multicolumn/multicolumn_ui.spec.ts b/packages/ckeditor5/src/plugins/multicolumn/multicolumn_ui.spec.tsindex 84ac3dfd30..940c9c6fc8 100644--- a/packages/ckeditor5/src/plugins/multicolumn/multicolumn_ui.spec.ts+++ b/packages/ckeditor5/src/plugins/multicolumn/multicolumn_ui.spec.ts@@ -6,7 +6,7 @@ import {ContextualBalloon,DropdownView,Essentials,- IconCancel,+ IconRemove,type ListItemView,type ModelElement,Paragraph,@@ -156,7 +156,7 @@ describe("MulticolumnUI", () => {setModelData(editor.model, layout("1-3", paragraph("A[]"), paragraph("B")));const button = editor.ui.componentFactory.create("removeMulticolumnLayout") as ButtonView;expect([button.label, button.icon, button.tooltip])- .toEqual(["Remove layout", IconCancel, true]);+ .toEqual(["Remove layout", IconRemove, true]);expect(button.isEnabled).toBe(true);const focus = vi.spyOn(editor.editing.view, "focus");@@ -260,7 +260,7 @@ describe("MulticolumnUI", () => {const buttons = items.map(item => "buttonView" in item ? item.buttonView : item);expect(buttons.map(button => [button.label, button.icon])).toEqual([["Column layout", createLayoutFigure("1-3", 20)],- ["Remove layout", IconCancel]+ ["Remove layout", IconRemove]]);});diff --git a/packages/ckeditor5/src/plugins/multicolumn/multicolumn_ui.ts b/packages/ckeditor5/src/plugins/multicolumn/multicolumn_ui.tsindex d576738acf..5bf1f4ddfb 100644--- a/packages/ckeditor5/src/plugins/multicolumn/multicolumn_ui.ts+++ b/packages/ckeditor5/src/plugins/multicolumn/multicolumn_ui.ts@@ -5,7 +5,7 @@ import {type Command,createDropdown,focusChildOnDropdownOpen,- IconCancel,+ IconRemove,type ListDropdownItemDefinition,type Locale,Plugin,@@ -42,7 +42,7 @@ export default class MulticolumnUI extends Plugin {const factory = this.editor.ui.componentFactory;factory.add("multicolumnLayout", locale => this.createInsertDropdown(locale));factory.add("columnLayout", locale => this.createLayoutDropdown(locale));- this.addCommandButton("removeMulticolumnLayout", t("Remove layout"), IconCancel);+ this.addCommandButton("removeMulticolumnLayout", t("Remove layout"), IconRemove);}public afterInit(): void {