Merge branch 'master' into next

Author: vashkinazi

.github/workflows/main.yml

@@ -24,7 +24,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: '16.15.0'
 
       - run: yarn install
       - run: yarn build

README.md

@@ -33,7 +33,7 @@ $ yarn start
 
 [Blog](https://dhtmlx.com/blog/tag/richtext/)
 
-[Forum](https://forum.dhtmlx.com/c/widgets/richtext/)
+[Forum](https://forum.dhtmlx.com/c/richtext/)
 
 ## Follow us
 

docker/redirects.conf

@@ -46,4 +46,6 @@
 /event_handling.html	/richtext/guides/event_handling;
 /angular_integration.html	/richtext/guides/angular_integration;
 /react_integration.html	/richtext/guides/react_integration;
-/vuejs_integration.html	/richtext/guides/vuejs_integration;
+/vuejs_integration.html	/richtext/guides/vuejs_integration;
+
+/overview/ /richtext/;

docs/api/methods.md

@@ -210,7 +210,7 @@ Adds content into the RichText editor
 ```js 
 var htmlText = `<h1>Meet DHTMLX Rich Text Editor!</h1>` +
 `<p>This demo will show you a customizable JavaScript rich text editor.</p>` +
-`<p><i>To learn more, read </i><a href="https://docs.dhtmlx.com/richtext/overview/"><i>documentation</i></a></p>.`
+`<p><i>To learn more, read </i><a href="https://docs.dhtmlx.com/richtext/"><i>documentation</i></a></p>.`
 
 // adding HTML content
 richtext.setValue(htmlText);
@@ -227,7 +227,7 @@ var mdText = `# Meet DHTMLX Rich Text Editor!
  
 This demo will show you a customizable **JavaScript rich text editor**.
  
-*To learn more, read [documentation](https://docs.dhtmlx.com/richtext/overview/)*.`
+*To learn more, read [documentation](https://docs.dhtmlx.com/richtext/)*.`
 
 richtext.setValue(mdText,"markdown");
 ```

docs/guides/customization.md

@@ -178,7 +178,7 @@ Toolbar
 
 ### Default controls
 
-The [default toolbar](overview.md#toolbar-structure) contains the following blocks of controls:
+The [default toolbar](../../#toolbar-structure) contains the following blocks of controls:
 
 - the **Undo** block 
     - the *Undo* button (id:"undo")

docs/guides/loading_data.md

@@ -60,7 +60,7 @@ var mdText = `# Meet DHTMLX Rich Text Editor!
 
 This demo will show you a customizable **JavaScript rich text editor**.
 
-*To learn more, read [documentation](https://docs.dhtmlx.com/richtext/overview/)*.`
+*To learn more, read [documentation](https://docs.dhtmlx.com/richtext/)*.`
 
 richtext.setValue(mdText,"markdown");
 ~~~

docusaurus.config.js

@@ -186,7 +186,7 @@ module.exports = {
                 },
                 {
                     label: 'Forum',
-                    href: 'https://forum.dhtmlx.com/c/widgets/richtext',
+                    href: 'https://forum.dhtmlx.com/c/richtext/',
                     position: 'right'
                 },
                 {
@@ -223,7 +223,7 @@ module.exports = {
                         },
                         {
                             label: 'Forum',
-                            href: 'https://forum.dhtmlx.com/c/widgets/richtext',
+                            href: 'https://forum.dhtmlx.com/c/richtext/',
                             position: 'right'
                         },
                     ],
@@ -282,7 +282,7 @@ module.exports = {
                 docs: {
                     sidebarPath: require.resolve('./sidebars.js'),
                     // Please change this to your repo.
-                    //editUrl: 'https://github.com/DHTMLX/docs-richtext/edit/master/',
+                    editUrl: 'https://github.com/DHTMLX/docs-richtext/edit/master/',
                     routeBasePath: '/',
                 },
                 // blog: {

package.json

@@ -11,8 +11,8 @@
     "serve": "docusaurus serve"
   },
   "dependencies": {
-    "@docusaurus/core": "^2.0.0-beta.16",
-    "@docusaurus/preset-classic": "^2.0.0-beta.16",
+    "@docusaurus/core": "^2.2.0",
+    "@docusaurus/preset-classic": "^2.2.0",
     "@mdx-js/react": "^1.5.8",
     "clsx": "^1.1.1",
     "docusaurus-gtm-plugin": "^0.0.2",

src/css/custom.css

@@ -113,9 +113,19 @@ table th:last-child {
     margin-bottom: var(--ifm-leading);
 }
 
-
 /* end indent for imgs */
 
+/* Link icons */
+
+.iconExternalLink_lCJq,
+.iconExternalLink_node_modules-\@docusaurus-theme-classic-lib-theme-IconExternalLink-styles-module,
+.iconExternalLink_nPIU,
+.iconExternalLink_node_modules-\@docusaurus-theme-classic-lib-theme-Icon-ExternalLink-styles-module {
+  display: none; /* hides the link icon */
+}
+
+/* end Link icons */
+
 
 /* Change the appearance of mobile navigation */
 
@@ -132,4 +142,13 @@ table th:last-child {
 }
 
 
-/* end change the appearance of mobile navigation */
+/* end change the appearance of mobile navigation */
+
+/* styles for block of code */
+
+.token-line.theme-code-block-highlighted-line{ /* added after updating to 2.0.0-beta.19 */
+    background-color: rgb(156 159 166 / 30%);
+}
+
+/* end styles for block of code */
+