瀏覽代碼

Merge branch 'master' into i/6202-remove-env.isEdge

Piotrek Koszuliński 5 年之前
父節點
當前提交
ce205a23a0

+ 1 - 0
packages/ckeditor5-theme-lark/package.json

@@ -30,6 +30,7 @@
     "@ckeditor/ckeditor5-paragraph": "^18.0.0",
     "@ckeditor/ckeditor5-remove-format": "^18.0.0",
     "@ckeditor/ckeditor5-restricted-editing": "^18.0.0",
+    "@ckeditor/ckeditor5-select-all": "^0.0.1",
     "@ckeditor/ckeditor5-special-characters": "^18.0.0",
     "@ckeditor/ckeditor5-undo": "^18.0.0",
     "@ckeditor/ckeditor5-utils": "^18.0.0",

+ 5 - 0
packages/ckeditor5-theme-lark/tests/manual/iconset.js

@@ -78,6 +78,8 @@ import removeFormat from '@ckeditor/ckeditor5-remove-format/theme/icons/remove-f
 import contentLock from '@ckeditor/ckeditor5-restricted-editing/theme/icons/contentlock.svg';
 import contentUnlock from '@ckeditor/ckeditor5-restricted-editing/theme/icons/contentunlock.svg';
 
+import selectAll from '@ckeditor/ckeditor5-select-all/theme/icons/select-all.svg';
+
 import specialCharacters from '@ckeditor/ckeditor5-special-characters/theme/icons/specialcharacters.svg';
 
 import table from '@ckeditor/ckeditor5-table/theme/icons/table.svg';
@@ -144,6 +146,9 @@ const icons = {
 	// restricted-editing
 	contentLock, contentUnlock,
 
+	// select-all
+	selectAll,
+
 	// special-characters
 	specialCharacters,
 

+ 16 - 5
packages/ckeditor5-theme-lark/theme/ckeditor5-table/tableselection.css

@@ -4,19 +4,31 @@
  */
 
 :root {
-	--ck-table-selected-cell-background: hsl(210, 92%, 90%);
+	--ck-table-selected-cell-background: hsla(208, 90%, 80%, .3);
 }
 
 .ck.ck-editor__editable .table table {
 	& td.ck-editor__editable_selected,
 	& th.ck-editor__editable_selected {
-		background-color: var(--ck-table-selected-cell-background) !important;
-
+		position: relative;
 		caret-color: transparent;
 		outline: unset;
 		box-shadow: unset;
 
-		& ::selection {
+		/* https://github.com/ckeditor/ckeditor5/issues/6446 */
+		&:after {
+			content: '';
+			pointer-events: none;
+			background-color: var(--ck-table-selected-cell-background);
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			bottom: 0;
+		}
+
+		& ::selection,
+		&:focus {
 			background-color: transparent;
 		}
 
@@ -25,4 +37,3 @@
 		}
 	}
 }
-