From 439b2799b7918bb5ddabb1042e253be5d64dbe36 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Wed, 27 Sep 2023 11:01:57 +0200
Subject: [PATCH] Revert "fix #2490"
This reverts commit 9e6341980628fa983eddf93ffe8f64470c4077c4.
---
.../assets/javascripts/chunks/wysiwyg.js | 2 +-
resources/assets/stylesheets/scss/forms.scss | 1 -
.../stylesheets/scss/studip-cke-ui.scss | 22 +++++--------------
3 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/resources/assets/javascripts/chunks/wysiwyg.js b/resources/assets/javascripts/chunks/wysiwyg.js
index b2d9987ea7e..b5161b19537 100644
--- a/resources/assets/javascripts/chunks/wysiwyg.js
+++ b/resources/assets/javascripts/chunks/wysiwyg.js
@@ -179,7 +179,7 @@ ClassicEditor.defaultConfig = {
'|',
'sourceEditing',
],
- shouldNotGroupWhenFull: false,
+ shouldNotGroupWhenFull: true,
},
fontColor: {
colors: customColorPalette,
diff --git a/resources/assets/stylesheets/scss/forms.scss b/resources/assets/stylesheets/scss/forms.scss
index 826f1064132..c83fc2fb17b 100644
--- a/resources/assets/stylesheets/scss/forms.scss
+++ b/resources/assets/stylesheets/scss/forms.scss
@@ -172,7 +172,6 @@ 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 1ec725bd012..65a29555276 100644
--- a/resources/assets/stylesheets/scss/studip-cke-ui.scss
+++ b/resources/assets/stylesheets/scss/studip-cke-ui.scss
@@ -68,8 +68,8 @@
.ck.ck-icon, .ck.ck-icon * {
color: var(--base-color);
}
-.ck.ck-button.ck-on .ck.ck-icon,
-.ck.ck-button.ck-on .ck.ck-icon *,
+.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: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);
@@ -108,7 +108,9 @@
.ck.ck-button.ck-off.ck-button_with-text:hover {
background-color: var(--base-color);
}
-.ck.ck-button.ck-button_with-text.ck-dropdown__button:not(.ck-disabled):hover {
+.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 {
background-color: var(--white);
color: var(--base-color);
}
@@ -395,12 +397,6 @@ form.default .ck-source-editing-area textarea {
max-width: calc(100% - 20px);
}
-.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;
@@ -409,11 +405,3 @@ 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);
- }
- }
-}
--
GitLab