chore: merge main to develop

camunda · Sep 26, 2024 · de04d8a · de04d8a
2 parents b8bb7ff + 79f7266
commit de04d8a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/client/src/app/tabs/json/CodeMirror.js b/client/src/app/tabs/json/CodeMirror.js
@@ -59,6 +59,7 @@ export default function create() {
           'aria-label': 'JSON editor',
           'tabindex': 0
         }),
+        EditorView.lineWrapping,
         ...extensions
       ]
     });

diff --git a/client/src/app/tabs/json/JSONEditor.less b/client/src/app/tabs/json/JSONEditor.less
@@ -37,7 +37,6 @@
 
     .cm-content {
       width: 100%;
-      white-space: normal;
       padding-right: 18px;
     }
 
@@ -64,7 +63,7 @@
       background-color: var(--json-editor-button-background-color);
       text-transform: capitalize;
     }
-    
+
     .cm-textfield {
       padding: 4px 8px;
       font-family: var(--font-family-monospace);
@@ -76,7 +75,7 @@
         font-family: var(--font-family);
       }
     }
-    
+
     .cm-panel.cm-search {
       label {
         font-size: var(--json-editor-font-size-small);
@@ -90,7 +89,7 @@
 
       [name=close] {
         font-size: 24px;
-        padding: 0px 8px; 
+        padding: 0px 8px;
       }
     }
   }

diff --git a/client/src/app/tabs/xml/CodeMirror.js b/client/src/app/tabs/xml/CodeMirror.js
@@ -59,6 +59,7 @@ export default function create() {
           'aria-label': 'XML editor',
           'tabindex': 0
         }),
+        EditorView.lineWrapping,
         ...extensions
       ]
     });

diff --git a/client/src/app/tabs/xml/XMLEditor.less b/client/src/app/tabs/xml/XMLEditor.less
@@ -38,7 +38,6 @@
 
     .cm-content {
       width: 100%;
-      white-space: normal;
       padding-right: 18px;
     }
 
@@ -65,7 +64,7 @@
       background-color: var(--xml-editor-button-background-color);
       text-transform: capitalize;
     }
-    
+
     .cm-textfield {
       padding: 4px 8px;
       font-family: var(--font-family-monospace);
@@ -77,7 +76,7 @@
         font-family: var(--font-family);
       }
     }
-    
+
     .cm-panel.cm-search {
       label {
         font-size: var(--xml-editor-font-size-small);
@@ -91,7 +90,7 @@
 
       [name=close] {
         font-size: 24px;
-        padding: 0px 8px; 
+        padding: 0px 8px;
       }
     }
   }