Skip to content
Snippets Groups Projects
Commit 0a237170 authored by Ron Lucke's avatar Ron Lucke Committed by Marcus Eibrink-Lunzenauer
Browse files

fix #1690

Closes #1690

Merge request studip/studip!1096
parent 0418eb93
Branches
No related tags found
No related merge requests found
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
"@ckeditor/ckeditor5-indent": "34.2.0", "@ckeditor/ckeditor5-indent": "34.2.0",
"@ckeditor/ckeditor5-paragraph": "34.2.0", "@ckeditor/ckeditor5-paragraph": "34.2.0",
"@ckeditor/ckeditor5-remove-format": "34.2.0", "@ckeditor/ckeditor5-remove-format": "34.2.0",
"@ckeditor/ckeditor5-select-all": "34.2.0",
"@ckeditor/ckeditor5-source-editing": "34.2.0", "@ckeditor/ckeditor5-source-editing": "34.2.0",
"@ckeditor/ckeditor5-special-characters": "34.2.0", "@ckeditor/ckeditor5-special-characters": "34.2.0",
"@ckeditor/ckeditor5-table": "34.2.0", "@ckeditor/ckeditor5-table": "34.2.0",
...@@ -4,7 +4,6 @@ import Autoformat from '@ckeditor/ckeditor5-autoformat/src/autoformat'; ...@@ -4,7 +4,6 @@ import Autoformat from '@ckeditor/ckeditor5-autoformat/src/autoformat';
import BlockQuote from '@ckeditor/ckeditor5-block-quote/src/blockquote'; import BlockQuote from '@ckeditor/ckeditor5-block-quote/src/blockquote';
import BoldPlugin from '@ckeditor/ckeditor5-basic-styles/src/bold'; import BoldPlugin from '@ckeditor/ckeditor5-basic-styles/src/bold';
import ClassicEditorBase from '@ckeditor/ckeditor5-editor-classic/src/classiceditor'; import ClassicEditorBase from '@ckeditor/ckeditor5-editor-classic/src/classiceditor';
import Code from '@ckeditor/ckeditor5-basic-styles/src/code';
import CodeBlock from '@ckeditor/ckeditor5-code-block/src/codeblock'; import CodeBlock from '@ckeditor/ckeditor5-code-block/src/codeblock';
import EasyImagePlugin from '@ckeditor/ckeditor5-easy-image/src/easyimage'; import EasyImagePlugin from '@ckeditor/ckeditor5-easy-image/src/easyimage';
import EssentialsPlugin from '@ckeditor/ckeditor5-essentials/src/essentials'; import EssentialsPlugin from '@ckeditor/ckeditor5-essentials/src/essentials';
...@@ -29,7 +28,6 @@ import List from '@ckeditor/ckeditor5-list/src/list'; ...@@ -29,7 +28,6 @@ import List from '@ckeditor/ckeditor5-list/src/list';
import ListProperties from '@ckeditor/ckeditor5-list/src/listproperties'; import ListProperties from '@ckeditor/ckeditor5-list/src/listproperties';
import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph'; import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
import RemoveFormat from '@ckeditor/ckeditor5-remove-format/src/removeformat.js'; import RemoveFormat from '@ckeditor/ckeditor5-remove-format/src/removeformat.js';
import SelectAll from '@ckeditor/ckeditor5-select-all/src/selectall';
import SourceEditing from '@ckeditor/ckeditor5-source-editing/src/sourceediting'; import SourceEditing from '@ckeditor/ckeditor5-source-editing/src/sourceediting';
import SpecialCharacters from '@ckeditor/ckeditor5-special-characters/src/specialcharacters.js'; import SpecialCharacters from '@ckeditor/ckeditor5-special-characters/src/specialcharacters.js';
import SpecialCharactersCurrency from '@ckeditor/ckeditor5-special-characters/src/specialcharacterscurrency.js'; import SpecialCharactersCurrency from '@ckeditor/ckeditor5-special-characters/src/specialcharacterscurrency.js';
...@@ -66,7 +64,6 @@ ClassicEditor.builtinPlugins = [ ...@@ -66,7 +64,6 @@ ClassicEditor.builtinPlugins = [
Autoformat, Autoformat,
BlockQuote, BlockQuote,
BoldPlugin, BoldPlugin,
Code,
CodeBlock, CodeBlock,
EssentialsPlugin, EssentialsPlugin,
FindAndReplace, FindAndReplace,
...@@ -87,7 +84,6 @@ ClassicEditor.builtinPlugins = [ ...@@ -87,7 +84,6 @@ ClassicEditor.builtinPlugins = [
Mathematics, Mathematics,
Paragraph, Paragraph,
RemoveFormat, RemoveFormat,
SelectAll,
SourceEditing, SourceEditing,
SpecialCharacters, SpecialCharacters,
SpecialCharactersCurrency, SpecialCharactersCurrency,
...@@ -138,25 +134,7 @@ ClassicEditor.defaultConfig = { ...@@ -138,25 +134,7 @@ ClassicEditor.defaultConfig = {
items: [ items: [
'undo', 'undo',
'redo', 'redo',
'|',
'findAndReplace', 'findAndReplace',
'selectAll',
'|',
'specialCharacters',
'horizontalLine',
'|',
'insertBlockQuote',
'splitBlockQuote',
'removeBlockQuote',
'|',
'link',
'insertTable',
'uploadImage',
'codeBlock',
'math',
'studip-wiki',
'-',
'heading',
'|', '|',
'bold', 'bold',
'italic', 'italic',
...@@ -164,24 +142,36 @@ ClassicEditor.defaultConfig = { ...@@ -164,24 +142,36 @@ ClassicEditor.defaultConfig = {
'strikethrough', 'strikethrough',
'subscript', 'subscript',
'superscript', 'superscript',
'code', '|',
'removeFormat', 'removeFormat',
'|', '|',
'fontColor', 'bulletedList',
'fontBackgroundColor', 'numberedList',
'|',
'outdent',
'indent',
'|', '|',
'alignment:left', 'alignment:left',
'alignment:right', 'alignment:right',
'alignment:center', 'alignment:center',
'alignment:justify', 'alignment:justify',
'-',
'heading',
'fontColor',
'fontBackgroundColor',
'|', '|',
'bulletedList', 'link',
'numberedList', 'insertTable',
'|', 'uploadImage',
'outdent', 'codeBlock',
'indent', 'math',
'studip-wiki',
'specialCharacters',
'horizontalLine',
'|', '|',
'open-a11y-dialog', 'insertBlockQuote',
'splitBlockQuote',
'removeBlockQuote',
'|', '|',
'sourceEditing', 'sourceEditing',
], ],
......
...@@ -113,6 +113,11 @@ function replaceTextarea(textarea) { ...@@ -113,6 +113,11 @@ function replaceTextarea(textarea) {
} }
}); });
const button = ckeditor.ui.view.toolbar.items.find( item => item.class === "ck-source-editing-button");
if (button) {
button.withText = false;
}
// TODO: Kein updateSourceElement im SourceEditing-Modus // TODO: Kein updateSourceElement im SourceEditing-Modus
// $(ckeditor.container.$).on('blur', '.CodeMirror', function (event) { // $(ckeditor.container.$).on('blur', '.CodeMirror', function (event) {
// ckeditor.updateElement(); // also update in source mode // ckeditor.updateElement(); // also update in source mode
......
...@@ -74,6 +74,9 @@ ...@@ -74,6 +74,9 @@
} }
/* buttons */ /* buttons */
.ck.ck-button, a.ck.ck-button {
font-size: 12px;
}
.ck.ck-button:hover { .ck.ck-button:hover {
cursor: pointer; cursor: pointer;
...@@ -212,6 +215,10 @@ a.ck.ck-button.ck-button_with-text.ck-dropdown__button:not(.ck-disabled):hover { ...@@ -212,6 +215,10 @@ a.ck.ck-button.ck-button_with-text.ck-dropdown__button:not(.ck-disabled):hover {
display: none; display: none;
} }
.ck.ck-button.ck-source-editing-button .ck.ck-button__label {
display: none;
}
/* links */ /* links */
.ck .ck-fake-link-selection, .ck .ck-fake-link-selection,
.ck .ck-link_selected { .ck .ck-link_selected {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment