Merge pull request #67 from ckeditor/t/ckeditor5-ui/144

Other: Migrated the editor styles to PostCSS. Moved visual styles to ckeditor5-theme-lark (see ckeditor/ckeditor5-ui#144).
ckeditor · Nov 30, 2017 · f24f97d · f24f97d
2 parents f5d69ec + 830a9f6
commit f24f97d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 46 deletions.
diff --git a/src/classiceditor.js b/src/classiceditor.js
@@ -13,8 +13,6 @@ import ClassicEditorUI from './classiceditorui';
 import ClassicEditorUIView from './classiceditoruiview';
 import ElementReplacer from '@ckeditor/ckeditor5-utils/src/elementreplacer';
 
-import '../theme/theme.scss';
-
 /**
  * The {@glink builds/guides/overview#Classic-editor classic editor} implementation.
  * It uses an inline editable and a sticky toolbar, all enclosed in a boxed UI.

diff --git a/src/classiceditoruiview.js b/src/classiceditoruiview.js
@@ -12,6 +12,8 @@ import InlineEditableUIView from '@ckeditor/ckeditor5-ui/src/editableui/inline/i
 import StickyPanelView from '@ckeditor/ckeditor5-ui/src/panel/sticky/stickypanelview';
 import ToolbarView from '@ckeditor/ckeditor5-ui/src/toolbar/toolbarview';
 
+import '../theme/classiceditor.css';
+
 /**
  * Classic editor UI view. Uses an inline editable and a sticky toolbar, all
  * enclosed in a boxed UI view.

diff --git a/theme/classiceditor.css b/theme/classiceditor.css
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
+.ck-editor {
+	/* All the elements within `.ck-editor` are positioned relatively to it.
+	 If any element needs to be positioned with respect to the <body>, etc.,
+	 it must land outside of the `.ck-editor` in DOM. */
+	position: relative;
+}
+
+.ck-editor__top .ck-sticky-panel .ck-toolbar {
+	/* https://github.com/ckeditor/ckeditor5-editor-classic/issues/62 */
+	z-index: var(--ck-z-modal);
+}
diff --git a/theme/theme.scss b/theme/theme.scss