Merge pull request #163 from ckeditor/t/ckeditor5/578

Other: Updated the classic editor and the editorui styles to the latest nested editable CSS class naming convention (see ckeditor/ckeditor5#578).
ckeditor · Mar 30, 2018 · 508db7c · 508db7c
2 parents 173481c + 583f740
commit 508db7c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/theme/ckeditor5-editor-classic/classiceditor.css b/theme/ckeditor5-editor-classic/classiceditor.css
@@ -27,7 +27,7 @@
 }
 
 /* Note: Use ck-editor__main to make sure these styles don't apply to other editor types */
-.ck.ck-editor__main .ck-editor__editable {
+.ck.ck-editor__main > .ck-editor__editable {
 	/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/113 */
 	background: var(--ck-color-base-background);
 

diff --git a/theme/ckeditor5-ui/components/editorui/editorui.css b/theme/ckeditor5-ui/components/editorui/editorui.css
@@ -9,7 +9,7 @@
 @import "../../../mixins/_focus.css";
 @import "../../mixins/_button.css";
 
-.ck.ck-editor__editable {
+.ck.ck-editor__editable:not(.ck-editor__nested-editable) {
 	@mixin ck-rounded-corners;
 
 	&.ck-focused {

diff --git a/theme/ckeditor5-widget/widget.css b/theme/ckeditor5-widget/widget.css
@@ -30,12 +30,12 @@
 		outline: var(--ck-widget-outline-thickness) solid var(--ck-color-widget-border-hover);
 	}
 
-	& .ck-editable {
+	& .ck-editor__nested-editable {
 		border: 1px solid transparent;
 
-		/* The :focus style is applied before .ck-editable_focused class is rendered in the view.
+		/* The :focus style is applied before .ck-editor__nested-editable_focused class is rendered in the view.
 		These styles show a different border for a blink of an eye, so `:focus` need to have same styles applied. */
-		&.ck-editable_focused,
+		&.ck-editor__nested-editable_focused,
 		&:focus {
 			@mixin ck-focus-ring;
 			@mixin ck-box-shadow var(--ck-inner-shadow);