Skip to content
Snippets Groups Projects
Commit 56e6709a authored by Elmar Ludwig's avatar Elmar Ludwig
Browse files

replace .ckplaceholder (cke4) with .ck.ck-editor, fixes #3758

Closes #3758

Merge request studip/studip!2628
parent e82999b4
No related branches found
No related tags found
No related merge requests found
...@@ -9,8 +9,4 @@ ...@@ -9,8 +9,4 @@
.cke { .cke {
width: 100% !important; width: 100% !important;
} }
.ckplaceholder {
height: 0 !important;
}
} }
...@@ -70,6 +70,10 @@ form.default { ...@@ -70,6 +70,10 @@ form.default {
} }
} }
.ck-source-editing-area textarea {
max-width: unset;
}
input[list] { input[list] {
@include background-icon(arr_1down, clickable); @include background-icon(arr_1down, clickable);
...@@ -80,6 +84,12 @@ form.default { ...@@ -80,6 +84,12 @@ form.default {
textarea:not(.size-l) + .ck-editor { textarea:not(.size-l) + .ck-editor {
max-width: $max-width-m; max-width: $max-width-m;
.ck-toolbar__grouped-dropdown {
.ck-toolbar {
max-width: calc($max-width-m - 2px);
}
}
} }
.quicksearch_container { .quicksearch_container {
...@@ -107,7 +117,7 @@ form.default { ...@@ -107,7 +117,7 @@ form.default {
input[type=date], input[type=email], input[type=number], input[type=date], input[type=email], input[type=number],
input[type=password], input[type=text], input[type=time], input[type=tel], input[type=url], input[type=password], input[type=text], input[type=time], input[type=tel], input[type=url],
textarea, select, .ckplaceholder { textarea, select, .ck.ck-editor {
display: block; display: block;
margin-top: 0.5ex; margin-top: 0.5ex;
} }
...@@ -115,6 +125,10 @@ form.default { ...@@ -115,6 +125,10 @@ form.default {
.ck-editor { .ck-editor {
text-indent: initial; text-indent: initial;
} }
.ck-source-editing-area textarea {
margin-top: 0;
}
} }
.formpart { .formpart {
......
...@@ -65,9 +65,6 @@ ...@@ -65,9 +65,6 @@
--ck-color-tooltip-text: var(--color-text); --ck-color-tooltip-text: var(--color-text);
} }
.ck.ck-editor {
margin-top: 0.5ex;
}
.ck.ck-icon, .ck.ck-icon * { .ck.ck-icon, .ck.ck-icon * {
color: var(--base-color); color: var(--base-color);
} }
...@@ -384,14 +381,6 @@ $editor-min-height: 8em; ...@@ -384,14 +381,6 @@ $editor-min-height: 8em;
min-height: $editor-min-height; min-height: $editor-min-height;
} }
form.default label:not(.undecorated):not(.ck-voice-label) .ck-source-editing-area textarea {
margin-top: 0;
}
form.default .ck-source-editing-area textarea {
max-width: unset;
}
/* forum fixes */ /* forum fixes */
#forum .ck-source-editing-area textarea { #forum .ck-source-editing-area textarea {
height: 100%; height: 100%;
...@@ -419,14 +408,6 @@ form.default .ck-source-editing-area textarea { ...@@ -419,14 +408,6 @@ 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*/ /* balloon editor button*/
.ck.ck-block-toolbar-button { .ck.ck-block-toolbar-button {
background-color: var(--dark-gray-color-5); background-color: var(--dark-gray-color-5);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment