Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into ck/12466-document-l…
Browse files Browse the repository at this point in the history
…ist-pasted-from-word-displayed-incorrectly
  • Loading branch information
mmotyczynska committed Aug 16, 2023
2 parents fb04003 + 94a9771 commit 5ac2b50
Show file tree
Hide file tree
Showing 569 changed files with 4,447 additions and 3,822 deletions.
276 changes: 103 additions & 173 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Contributing
========================================

See the [official contributors' guide to CKEditor 5](https://ckeditor.com/docs/ckeditor5/latest/framework/contributing/contributing.html) to learn more.
See the [official contributors' guide to CKEditor 5](https://ckeditor.com/docs/ckeditor5/latest/framework/contributing/contributing.html) to learn more.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Software License Agreement
==========================

**CKEditor 5**https://github.com/ckeditor/ckeditor5 <br>
**CKEditor&nbsp;5**https://github.com/ckeditor/ckeditor5 <br>
Copyright (c) 2003-2023, [CKSource Holding sp. z o.o.](https://cksource.com) All rights reserved.

Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html).
Expand Down
72 changes: 36 additions & 36 deletions README.md

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions docs/api/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ category: api-reference

## Documentation

* {@link framework/index CKEditor 5 Framework} &ndash; Learn how to develop with CKEditor 5 Framework, customize it and create plugins.
* {@link installation/index Installing CKEditor 5} &ndash; Learn how to install, integrate and configure CKEditor 5 builds. More complex aspects, like creating custom builds, are explained here, too.
* {@link features/index Features} &ndash; Learn about some of the features included in CKEditor 5 builds.
* {@link framework/index CKEditor&nbsp;5 Framework} &ndash; Learn how to develop with CKEditor&nbsp;5 Framework, customize it and create plugins.
* {@link installation/index Installing CKEditor&nbsp;5} &ndash; Learn how to install, integrate and configure CKEditor&nbsp;5 builds. More complex aspects, like creating custom builds, are explained here, too.
* {@link features/index Features} &ndash; Learn about some of the features included in CKEditor&nbsp;5 builds.

## Contribute

Expand Down
4 changes: 2 additions & 2 deletions docs/examples/custom/bottom-toolbar-editor.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ modified_at: 2021-12-09

# Editor with a bottom toolbar and button grouping

The following custom editor example showcases an editor instance with the main toolbar displayed at the bottom of the editing window. To make it possible, the {@link module:editor-decoupled/decouplededitor~DecoupledEditor `DecoupledEditor`} was used with the {@link module:editor-decoupled/decouplededitoruiview~DecoupledEditorUIView#toolbar main toolbar} injected after the editing root into the DOM. Learn more about the {@link framework/document-editor decoupled UI in CKEditor 5} to find out the details of this process.
The following custom editor example showcases an editor instance with the main toolbar displayed at the bottom of the editing window. To make it possible, the {@link module:editor-decoupled/decouplededitor~DecoupledEditor `DecoupledEditor`} was used with the {@link module:editor-decoupled/decouplededitoruiview~DecoupledEditorUIView#toolbar main toolbar} injected after the editing root into the DOM. Learn more about the {@link framework/document-editor decoupled UI in CKEditor&nbsp;5} to find out the details of this process.

Additionally, thanks to the flexibility offered by the {@link framework/architecture/ui-library CKEditor 5 UI framework}, the main toolbar has been uncluttered by moving buttons related to text formatting into the custom "Formatting options" dropdown. All remaining dropdown and (button) tooltips have been tuned to open upward for the best user experience. Similar effect can also be achieved by using the {@link features/toolbar#grouping-toolbar-items-in-drop-downs-nested-toolbars built-in toolbar grouping option}.
Additionally, thanks to the flexibility offered by the {@link framework/architecture/ui-library CKEditor&nbsp;5 UI framework}, the main toolbar has been uncluttered by moving buttons related to text formatting into the custom "Formatting options" dropdown. All remaining dropdown and (button) tooltips have been tuned to open upward for the best user experience. Similar effect can also be achieved by using the {@link features/toolbar#grouping-toolbar-items-in-drop-downs-nested-toolbars built-in toolbar grouping option}.

The presented combination of the UI and editor's features works best for integrations where text creation comes first and formatting is applied occasionally, for example in email applications, (forum) post editors, chats or instant messaging. You can probably recognize this UI setup from some popular applications such as Gmail, Slack or Zendesk.

Expand Down
4 changes: 2 additions & 2 deletions docs/examples/experiments/mermaid.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ modified_at: 2023-06-14

# Creating flowcharts and diagrams using Mermaid

You can create flowcharts and diagrams in CKEditor 5 thanks to the experimental integration with the [Mermaid](https://mermaid.js.org/) library. Mermaid uses a Markdown-inspired syntax to create and dynamically modify flowcharts, Gantt diagrams, pie or quadrant charts, graphs, mindmaps, and more.
You can create flowcharts and diagrams in CKEditor&nbsp;5 thanks to the experimental integration with the [Mermaid](https://mermaid.js.org/) library. Mermaid uses a Markdown-inspired syntax to create and dynamically modify flowcharts, Gantt diagrams, pie or quadrant charts, graphs, mindmaps, and more.

The example below lets you test creating diagrams and flowcharts right during the content creation &mdash; no more screenshots that need to be re-created and re-uploaded each time something needs a change! You can also check out a live implementation in [GitHub Writer](https://ckeditor.com/blog/github-writer-now-available-with-mermaid-support/).

Expand All @@ -24,7 +24,7 @@ Mermaid offers an extensive and flexible syntax allowing users to create a varie

## Editor example configuration

This example uses our own Mermaid plugin, [available on GitHub](https://github.com/ckeditor/ckeditor5-mermaid). You need to import it before CKEditor 5 can use the Mermaid syntax. Look at the sample configuration to learn how to add the plugin and the toolbar button.
This example uses our own Mermaid plugin, [available on GitHub](https://github.com/ckeditor/ckeditor5-mermaid). You need to import it before CKEditor&nbsp;5 can use the Mermaid syntax. Look at the sample configuration to learn how to add the plugin and the toolbar button.

<details>
<summary>Editor configuration script</summary>
Expand Down
Loading

0 comments on commit 5ac2b50

Please sign in to comment.