From 771d8da001aa3fccc1f9f9748ad49380c8075aeb Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Mon, 18 Sep 2023 16:23:47 +0000
Subject: [PATCH] fix #2490
Closes #2490
Merge request studip/studip!1683
---
.../assets/javascripts/cke/classic-editor.js | 2 +-
resources/assets/stylesheets/scss/forms.scss | 1 +
.../stylesheets/scss/studip-cke-ui.scss | 27 ++++++++++++-------
3 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/resources/assets/javascripts/cke/classic-editor.js b/resources/assets/javascripts/cke/classic-editor.js
index 53154c321db..0e21c0a21ab 100644
--- a/resources/assets/javascripts/cke/classic-editor.js
+++ b/resources/assets/javascripts/cke/classic-editor.js
@@ -54,7 +54,7 @@ ClassicEditor.defaultConfig = {
'|',
'sourceEditing',
],
- shouldNotGroupWhenFull: true,
+ shouldNotGroupWhenFull: false,
},
};
diff --git a/resources/assets/stylesheets/scss/forms.scss b/resources/assets/stylesheets/scss/forms.scss
index fe376dbbb16..71c4f1cf6b3 100644
--- a/resources/assets/stylesheets/scss/forms.scss
+++ b/resources/assets/stylesheets/scss/forms.scss
@@ -172,6 +172,7 @@ form.default {
box-sizing: border-box;
border: solid 1px $content-color-40;
margin: 0 0 10px;
+ min-width: auto;
padding: $gap 10px 10px;
> legend {
diff --git a/resources/assets/stylesheets/scss/studip-cke-ui.scss b/resources/assets/stylesheets/scss/studip-cke-ui.scss
index 5e28678235e..05497aa0863 100644
--- a/resources/assets/stylesheets/scss/studip-cke-ui.scss
+++ b/resources/assets/stylesheets/scss/studip-cke-ui.scss
@@ -71,8 +71,8 @@
.ck.ck-icon, .ck.ck-icon * {
color: var(--base-color);
}
-.ck.ck-button.ck-on:not(.ck-dropdown__button) .ck.ck-icon,
-.ck.ck-button.ck-on:not(.ck-dropdown__button) .ck.ck-icon *,
+.ck.ck-button.ck-on .ck.ck-icon,
+.ck.ck-button.ck-on .ck.ck-icon *,
.ck.ck-button:not(.ck-dropdown__button.ck-button_with-text):not(.ck-disabled):hover .ck.ck-icon,
.ck.ck-button:not(.ck-dropdown__button.ck-button_with-text):not(.ck-disabled):hover .ck.ck-icon * {
color: var(--white);
@@ -112,9 +112,7 @@
.ck.ck-button.ck-off.ck-button_with-text:hover {
background-color: var(--base-color);
}
-.ck.ck-button.ck-on.ck-dropdown__button,
-.ck.ck-button.ck-button_with-text.ck-dropdown__button:not(.ck-disabled):hover,
-a.ck.ck-button.ck-button_with-text.ck-dropdown__button:not(.ck-disabled):hover {
+.ck.ck-button.ck-button_with-text.ck-dropdown__button:not(.ck-disabled):hover {
background-color: var(--white);
color: var(--base-color);
}
@@ -414,16 +412,18 @@ form.default .ck-source-editing-area textarea {
.ck.ck-toolbar {
background-color: var(--dark-gray-color-5);
}
-/* toolbar fix for dialogs */
-.ck.ck-toolbar > .ck-toolbar__items {
- max-width: calc(100% - 20px);
-}
/* tooltip fix for balloon panel */
.ck.ck-balloon-panel.ck-tooltip {
padding: 0;
}
+.ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_sw {
+ right: -5px;
+ top: calc(100% + 4px);
+}
+
+/* toolbar fix for dialogs */
.studip-dialog {
.ck-editor {
overflow: hidden;
@@ -433,6 +433,15 @@ form.default .ck-source-editing-area textarea {
}
}
}
+
+form.default textarea:not(.size-l) + .ck-editor {
+ .ck-toolbar__grouped-dropdown {
+ .ck-toolbar {
+ max-width: calc(48em - 2px);
+ }
+ }
+}
+
/* balloon editor button*/
.ck.ck-block-toolbar-button {
background-color: var(--dark-gray-color-5);
--
GitLab