Sfoglia il codice sorgente

Merge branch 'master' into i/5580

Aleksander Nowodzinski 6 anni fa
parent
commit
900b8cff58

+ 1 - 1
packages/ckeditor5-theme-lark/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 ### Suggested merge commit message ([convention](https://github.com/ckeditor/ckeditor5-design/wiki/Git-commit-message-convention))
 
-Type: Message. Closes #000.
+Type: Message. Closes ckeditor/ckeditor5#000.
 
 ---
 

+ 5 - 0
packages/ckeditor5-theme-lark/docs/_snippets/examples/custom.css

@@ -53,6 +53,11 @@
 	--ck-color-dropdown-panel-background: var(--ck-custom-background);
 	--ck-color-dropdown-panel-border: var(--ck-custom-foreground);
 
+	/* -- Overrides the default .ck-splitbutton class colors. ----------------------------------- */
+
+	--ck-color-split-button-hover-background: var(--ck-color-button-default-hover-background);
+	--ck-color-split-button-hover-border: var(--ck-custom-foreground);
+
 	/* -- Overrides the default .ck-input class colors. ----------------------------------------- */
 
 	--ck-color-input-background: var(--ck-custom-foreground);

+ 5 - 0
packages/ckeditor5-theme-lark/docs/framework/guides/theme-customization.md

@@ -119,6 +119,11 @@ The file containing custom variables will be named `custom.css` and it will look
 	--ck-color-dropdown-panel-background: var(--ck-custom-background);
 	--ck-color-dropdown-panel-border: var(--ck-custom-foreground);
 
+	/* -- Overrides the default .ck-splitbutton class colors. ----------------------------------- */
+
+	--ck-color-split-button-hover-background: var(--ck-color-button-default-hover-background);
+	--ck-color-split-button-hover-border: var(--ck-custom-foreground);
+
 	/* -- Overrides the default .ck-input class colors. ----------------------------------------- */
 
 	--ck-color-input-background: var(--ck-custom-foreground);

+ 5 - 0
packages/ckeditor5-theme-lark/tests/manual/inverted.html

@@ -47,6 +47,11 @@
 		--ck-color-dropdown-panel-background: var(--ck-custom-background);
 		--ck-color-dropdown-panel-border: var(--ck-custom-foreground);
 
+		/* -- Overrides the default .ck-splitbutton class colors. ----------------------------------- */
+
+		--ck-color-split-button-hover-background: var(--ck-color-button-default-hover-background);
+		--ck-color-split-button-hover-border: var(--ck-custom-foreground);
+
 		/* -- Overrides the default .ck-input class colors ------------------------------------------ */
 
 		--ck-color-input-background: var(--ck-custom-foreground);

+ 3 - 2
packages/ckeditor5-theme-lark/tests/manual/inverted.js

@@ -11,10 +11,11 @@ import ArticlePluginSet from '@ckeditor/ckeditor5-core/tests/_utils/articleplugi
 
 import Strikethrough from '@ckeditor/ckeditor5-basic-styles/src/strikethrough';
 import Code from '@ckeditor/ckeditor5-basic-styles/src/code';
+import Highlight from '@ckeditor/ckeditor5-highlight/src/highlight';
 
 const config = {
-	plugins: [ ArticlePluginSet, Strikethrough, Code ],
-	toolbar: [ 'heading', '|', 'bold', 'italic', 'strikethrough', 'code', 'link', '|', 'undo', 'redo' ]
+	plugins: [ ArticlePluginSet, Strikethrough, Code, Highlight ],
+	toolbar: [ 'heading', '|', 'bold', 'italic', 'strikethrough', 'code', 'link', '|', 'highlight', '|', 'undo', 'redo' ]
 };
 
 ClassicEditor