diff --git a/core/modules/ckeditor/css/ckeditor.css b/core/modules/ckeditor/css/ckeditor.css index c1e2d4409fb1..400c6da9125e 100644 --- a/core/modules/ckeditor/css/ckeditor.css +++ b/core/modules/ckeditor/css/ckeditor.css @@ -23,17 +23,3 @@ font-size: 14px; -webkit-touch-callout: none; } - -/** - * Adjust the style of in-place editing CKEditor instances. - */ -.quickedit-toolgroup.wysiwyg-main .cke_chrome, -.quickedit-toolgroup.wysiwyg-main .cke_inner, -.quickedit-toolgroup.wysiwyg-main .cke_top { - border-top: none; - border-right: none; - border-bottom: none; - border-left: none; - background: transparent; - box-shadow: none; -} diff --git a/core/modules/ckeditor5/ckeditor5.libraries.yml b/core/modules/ckeditor5/ckeditor5.libraries.yml index 6e86ee030fb1..21e2af573de2 100644 --- a/core/modules/ckeditor5/ckeditor5.libraries.yml +++ b/core/modules/ckeditor5/ckeditor5.libraries.yml @@ -17,9 +17,6 @@ drupal.ckeditor5.internal: drupal.ckeditor5: js: js/ckeditor5.js: {} - css: - theme: - css/quickedit.css: { } dependencies: - core/jquery - core/once diff --git a/core/modules/quickedit/css/editors/formattedText.ckeditor.css b/core/modules/quickedit/css/editors/formattedText.ckeditor.css new file mode 100644 index 000000000000..6850af4c65fd --- /dev/null +++ b/core/modules/quickedit/css/editors/formattedText.ckeditor.css @@ -0,0 +1,18 @@ +/** + * @file + * Functional styles for the CKEditor-based formatted text in-place editor. + */ + +/** + * Adjust the style of in-place editing CKEditor instances. + */ +.quickedit-toolgroup.wysiwyg-main .cke_chrome, +.quickedit-toolgroup.wysiwyg-main .cke_inner, +.quickedit-toolgroup.wysiwyg-main .cke_top { + border-top: none; + border-right: none; + border-bottom: none; + border-left: none; + background: transparent; + box-shadow: none; +} diff --git a/core/modules/quickedit/css/editors/formattedText.ckeditor5.css b/core/modules/quickedit/css/editors/formattedText.ckeditor5.css new file mode 100644 index 000000000000..9608266e2f16 --- /dev/null +++ b/core/modules/quickedit/css/editors/formattedText.ckeditor5.css @@ -0,0 +1,9 @@ +/** + * @file + * Functional styles for the CKEditor 5-based formatted text in-place editor. + */ + +.quickedit-toolgroup.wysiwyg-main .ck.ck-toolbar { + border: none; + background: none; +} diff --git a/core/modules/quickedit/quickedit.libraries.yml b/core/modules/quickedit/quickedit.libraries.yml index e005342ee8f2..c6ead41d328d 100644 --- a/core/modules/quickedit/quickedit.libraries.yml +++ b/core/modules/quickedit/quickedit.libraries.yml @@ -50,6 +50,10 @@ quickedit.inPlaceEditor.form: quickedit.inPlaceEditor.formattedText: version: VERSION + css: + component: + css/editors/formattedText.ckeditor.css: {} + css/editors/formattedText.ckeditor5.css: {} js: js/editors/formattedTextEditor.js: { attributes: { defer: true } } dependencies: diff --git a/core/themes/stable/css/quickedit/editors/formattedText.ckeditor.css b/core/themes/stable/css/quickedit/editors/formattedText.ckeditor.css new file mode 100644 index 000000000000..6850af4c65fd --- /dev/null +++ b/core/themes/stable/css/quickedit/editors/formattedText.ckeditor.css @@ -0,0 +1,18 @@ +/** + * @file + * Functional styles for the CKEditor-based formatted text in-place editor. + */ + +/** + * Adjust the style of in-place editing CKEditor instances. + */ +.quickedit-toolgroup.wysiwyg-main .cke_chrome, +.quickedit-toolgroup.wysiwyg-main .cke_inner, +.quickedit-toolgroup.wysiwyg-main .cke_top { + border-top: none; + border-right: none; + border-bottom: none; + border-left: none; + background: transparent; + box-shadow: none; +} diff --git a/core/themes/stable/css/quickedit/editors/formattedText.ckeditor5.css b/core/themes/stable/css/quickedit/editors/formattedText.ckeditor5.css new file mode 100644 index 000000000000..6850af4c65fd --- /dev/null +++ b/core/themes/stable/css/quickedit/editors/formattedText.ckeditor5.css @@ -0,0 +1,18 @@ +/** + * @file + * Functional styles for the CKEditor-based formatted text in-place editor. + */ + +/** + * Adjust the style of in-place editing CKEditor instances. + */ +.quickedit-toolgroup.wysiwyg-main .cke_chrome, +.quickedit-toolgroup.wysiwyg-main .cke_inner, +.quickedit-toolgroup.wysiwyg-main .cke_top { + border-top: none; + border-right: none; + border-bottom: none; + border-left: none; + background: transparent; + box-shadow: none; +} diff --git a/core/themes/stable/stable.info.yml b/core/themes/stable/stable.info.yml index 13f28498ce42..687f25319702 100644 --- a/core/themes/stable/stable.info.yml +++ b/core/themes/stable/stable.info.yml @@ -188,6 +188,11 @@ libraries-override: theme: css/quickedit.theme.css: css/quickedit/quickedit.theme.css css/quickedit.icons.theme.css: css/quickedit/quickedit.icons.theme.css + quickedit/quickedit.inPlaceEditor.formattedText: + css: + component: + css/editors/formattedText.ckeditor.css: css/quickedit/editors/formattedText.ckeditor.css + css/editors/formattedText.ckeditor5.css: css/quickedit/editors/formattedText.ckeditor5.css quickedit/quickedit.inPlaceEditor.image: css: component: diff --git a/core/themes/stable9/css/quickedit/editors/formattedText.ckeditor.css b/core/themes/stable9/css/quickedit/editors/formattedText.ckeditor.css new file mode 100644 index 000000000000..6850af4c65fd --- /dev/null +++ b/core/themes/stable9/css/quickedit/editors/formattedText.ckeditor.css @@ -0,0 +1,18 @@ +/** + * @file + * Functional styles for the CKEditor-based formatted text in-place editor. + */ + +/** + * Adjust the style of in-place editing CKEditor instances. + */ +.quickedit-toolgroup.wysiwyg-main .cke_chrome, +.quickedit-toolgroup.wysiwyg-main .cke_inner, +.quickedit-toolgroup.wysiwyg-main .cke_top { + border-top: none; + border-right: none; + border-bottom: none; + border-left: none; + background: transparent; + box-shadow: none; +} diff --git a/core/themes/stable9/css/quickedit/editors/formattedText.ckeditor5.css b/core/themes/stable9/css/quickedit/editors/formattedText.ckeditor5.css new file mode 100644 index 000000000000..6850af4c65fd --- /dev/null +++ b/core/themes/stable9/css/quickedit/editors/formattedText.ckeditor5.css @@ -0,0 +1,18 @@ +/** + * @file + * Functional styles for the CKEditor-based formatted text in-place editor. + */ + +/** + * Adjust the style of in-place editing CKEditor instances. + */ +.quickedit-toolgroup.wysiwyg-main .cke_chrome, +.quickedit-toolgroup.wysiwyg-main .cke_inner, +.quickedit-toolgroup.wysiwyg-main .cke_top { + border-top: none; + border-right: none; + border-bottom: none; + border-left: none; + background: transparent; + box-shadow: none; +} diff --git a/core/themes/stable9/stable9.info.yml b/core/themes/stable9/stable9.info.yml index 32595170a159..dfd3849acd85 100644 --- a/core/themes/stable9/stable9.info.yml +++ b/core/themes/stable9/stable9.info.yml @@ -208,6 +208,11 @@ libraries-override: theme: css/quickedit.theme.css: css/quickedit/quickedit.theme.css css/quickedit.icons.theme.css: css/quickedit/quickedit.icons.theme.css + quickedit/quickedit.inPlaceEditor.formattedText: + css: + component: + css/editors/formattedText.ckeditor.css: css/quickedit/editors/formattedText.ckeditor.css + css/editors/formattedText.ckeditor5.css: css/quickedit/editors/formattedText.ckeditor5.css quickedit/quickedit.inPlaceEditor.image: css: component: