Browse Source

Merge branch 'master' into t/ckeditor5-table/24

Aleksander Nowodzinski 7 years ago
parent
commit
32e15964a9

+ 23 - 0
packages/ckeditor5-theme-lark/theme/ckeditor5-table/tableediting.css

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
+:root {
+	--ck-color-table-focused-cell-background: hsl(208, 90%, 98%);
+}
+
+.ck table.ck-widget {
+	& td,
+	& th {
+		&.ck-editor__nested-editable.ck-editor__nested-editable_focused {
+			/* A very slight background to highlight the focused cell */
+			background: var(--ck-color-table-focused-cell-background);
+
+			/* Fixes the problem where surrounding cells cover the focused cell's border.
+			It does not fix the problem in all places but the UX is improved.
+			See https://github.com/ckeditor/ckeditor5-table/issues/29. */
+			border-style: double;
+		}
+	}
+}

+ 10 - 10
packages/ckeditor5-theme-lark/theme/ckeditor5-widget/widget.css

@@ -29,18 +29,18 @@
 	&:hover {
 		outline: var(--ck-widget-outline-thickness) solid var(--ck-color-widget-border-hover);
 	}
+}
 
-	& .ck-editor__nested-editable {
-		border: 1px solid transparent;
+.ck .ck-editor__nested-editable {
+	border: 1px solid transparent;
 
-		/* 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-editor__nested-editable_focused,
-		&:focus {
-			@mixin ck-focus-ring;
-			@mixin ck-box-shadow var(--ck-inner-shadow);
+	/* 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-editor__nested-editable_focused,
+	&:focus {
+		@mixin ck-focus-ring;
+		@mixin ck-box-shadow var(--ck-inner-shadow);
 
-			background-color: var(--ck-color-widget-editable-focused-background);
-		}
+		background-color: var(--ck-color-widget-editable-focused-background);
 	}
 }