Skip to content
Snippets Groups Projects
Commit 9e634198 authored by Ron Lucke's avatar Ron Lucke Committed by Jan-Hendrik Willms
Browse files

fix #2490

Closes #2490

Merge request studip/studip!1683
parent 78f5ad6a
No related branches found
No related tags found
No related merge requests found
......@@ -179,7 +179,7 @@ ClassicEditor.defaultConfig = {
'|',
'sourceEditing',
],
shouldNotGroupWhenFull: true,
shouldNotGroupWhenFull: false,
},
fontColor: {
colors: customColorPalette,
......
......@@ -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 {
......
......@@ -68,8 +68,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);
......@@ -108,9 +108,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);
}
......@@ -397,6 +395,12 @@ 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;
......@@ -405,3 +409,11 @@ 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);
}
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment