Fix several problems of #1899.

Merge request studip/studip!1732

5 files changed, 51 insertions, 8 deletions

diff --git a/resources/assets/javascripts/chunks/wysiwyg.js b/resources/assets/javascripts/chunks/wysiwyg.js
index ade5731..7d9ccfc 100644
--- a/resources/assets/javascripts/chunks/wysiwyg.js
+++ b/resources/assets/javascripts/chunks/wysiwyg.js
@@ -220,10 +220,21 @@ ClassicEditor.defaultConfig = {
         tableProperties: {
             borderColors: customColorPalette,
             backgroundColors: customColorPalette,
+            defaultProperties: {
+                alignment: 'left',
+                borderStyle: 'solid',
+                borderColor: '#666666',
+                borderWidth: '1px',
+            },
         },
         tableCellProperties: {
             borderColors: customColorPalette,
             backgroundColors: customColorPalette,
+            defaultProperties: {
+                borderStyle: 'solid',
+                borderColor: '#666666',
+                borderWidth: '1px',
+            },
         },
     },
     typing: {
diff --git a/resources/assets/stylesheets/scss/content.scss b/resources/assets/stylesheets/scss/content.scss
index aca9cb0..4769434 100644
--- a/resources/assets/stylesheets/scss/content.scss
+++ b/resources/assets/stylesheets/scss/content.scss
@@ -55,18 +55,16 @@
         white-space: pre-wrap;
     }
 
-    figure {
+    figure.table {
         display: table;
         margin: 0.9em auto;
 
-        table {
-            width: 100%;
-            height: 100%;
-            border-collapse: collapse;
-            border-spacing: 0;
+        &:not([style]) {
+            margin-inline-start: 0;
+        }
 
+        table {
             td {
-                border: unset;
                 min-width: 2em;
                 padding: 0.4em;
             }
diff --git a/resources/assets/stylesheets/scss/studip-cke-ui.scss b/resources/assets/stylesheets/scss/studip-cke-ui.scss
index a6cd72b..65a2955 100644
--- a/resources/assets/stylesheets/scss/studip-cke-ui.scss
+++ b/resources/assets/stylesheets/scss/studip-cke-ui.scss
@@ -260,6 +260,18 @@ a.ck.ck-button.ck-button_with-text.ck-dropdown__button:not(.ck-disabled):hover {
     border: 1px solid var(--dark-gray-color-60);
 }
 
+/* table */
+.ck-content .table {
+    margin: 0.9em auto;
+}
+.ck-content .table {
+    margin: 0.9em auto;
+
+    &:not([style]) {
+        margin-inline-start: 0;
+    }
+}
+
 /* StudipWikiLink plugin */
 .ck.ck-studip-wiki-link-form {
     max-width: 100%;
diff --git a/resources/assets/stylesheets/scss/typography.scss b/resources/assets/stylesheets/scss/typography.scss
index e225c42..0c2295d 100644
--- a/resources/assets/stylesheets/scss/typography.scss
+++ b/resources/assets/stylesheets/scss/typography.scss
@@ -69,7 +69,7 @@ h1, h2 {
 
 h1 {
   margin-top: 0;
-  span {
+  span:not([style]) {
     display: block;
     font-size: calc($font-size-h1 * 0.75);
     font-weight: calc($headings-font-weight / 7);
diff --git a/resources/assets/stylesheets/studip.less b/resources/assets/stylesheets/studip.less
index 1cb3da3..d0ba056 100644
--- a/resources/assets/stylesheets/studip.less
+++ b/resources/assets/stylesheets/studip.less
@@ -45,6 +45,28 @@ table.content {
         border: thin solid #666;
         padding: 3px;
     }
+
+    /* for CKE5 Table Border Colors */
+    &[style*='border-color'] {
+        border-width: thin;
+        border-style: solid;
+    }
+
+    td:first-child {
+        border-inline-start: unset;
+    }
+
+    td:last-child {
+        border-inline-end: unset;
+    }
+
+    tr:first-child td {
+        border-block-start: unset;
+    }
+
+    tr:last-child td {
+        border-block-end: unset;
+    }
 }