浏览代码

Merge branch 'master' into t/ckeditor5-ui/389

Aleksander Nowodzinski 7 年之前
父节点
当前提交
bd3c9e0d89

+ 1 - 1
packages/ckeditor5-theme-lark/README.md

@@ -4,7 +4,7 @@ CKEditor 5 Lark theme
 [![Join the chat at https://gitter.im/ckeditor/ckeditor5](https://badges.gitter.im/ckeditor/ckeditor5.svg)](https://gitter.im/ckeditor/ckeditor5?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-theme-lark.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-theme-lark)
 [![Build Status](https://travis-ci.org/ckeditor/ckeditor5-theme-lark.svg?branch=master)](https://travis-ci.org/ckeditor/ckeditor5-theme-lark)
-[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=d3hvenZqQVZERFQ5d09FWXdyT0ozVXhLaVltRFRjTTUyZGpvQWNmWVhUUT0tLUZqNlJ1YWRUd0RvdEVOaEptM1B2Q0E9PQ==--c9d3dee40b9b4471ff3fb516d9ecf8d09292c7e0)](https://www.browserstack.com/automate/public-build/d3hvenZqQVZERFQ5d09FWXdyT0ozVXhLaVltRFRjTTUyZGpvQWNmWVhUUT0tLUZqNlJ1YWRUd0RvdEVOaEptM1B2Q0E9PQ==--c9d3dee40b9b4471ff3fb516d9ecf8d09292c7e0)
+[![BrowserStack Status](https://automate.browserstack.com/automate/badge.svg?badge_key=d3hvenZqQVZERFQ5d09FWXdyT0ozVXhLaVltRFRjTTUyZGpvQWNmWVhUUT0tLUZqNlJ1YWRUd0RvdEVOaEptM1B2Q0E9PQ==--c9d3dee40b9b4471ff3fb516d9ecf8d09292c7e0)](https://automate.browserstack.com/public-build/d3hvenZqQVZERFQ5d09FWXdyT0ozVXhLaVltRFRjTTUyZGpvQWNmWVhUUT0tLUZqNlJ1YWRUd0RvdEVOaEptM1B2Q0E9PQ==--c9d3dee40b9b4471ff3fb516d9ecf8d09292c7e0)
 [![Coverage Status](https://coveralls.io/repos/github/ckeditor/ckeditor5-theme-lark/badge.svg?branch=master)](https://coveralls.io/github/ckeditor/ckeditor5-theme-lark?branch=master)
 <br>
 [![Dependency Status](https://david-dm.org/ckeditor/ckeditor5-theme-lark/status.svg)](https://david-dm.org/ckeditor/ckeditor5-theme-lark)

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

@@ -20,9 +20,11 @@
     "@ckeditor/ckeditor5-editor-classic": "^10.0.0",
     "@ckeditor/ckeditor5-easy-image": "^10.0.0",
     "@ckeditor/ckeditor5-font": "^10.0.0",
+    "@ckeditor/ckeditor5-heading": "^10.0.0",
     "@ckeditor/ckeditor5-highlight": "^10.0.0",
     "@ckeditor/ckeditor5-link": "^10.0.0",
     "@ckeditor/ckeditor5-list": "^10.0.0",
+    "@ckeditor/ckeditor5-paragraph": "^10.0.0",
     "@ckeditor/ckeditor5-undo": "^10.0.0",
     "@ckeditor/ckeditor5-utils": "^10.0.0",
     "eslint": "^4.15.0",

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

@@ -33,6 +33,10 @@ import quote from '@ckeditor/ckeditor5-core/theme/icons/quote.svg';
 import fontFamily from '@ckeditor/ckeditor5-font/theme/icons/font-family.svg';
 import fontSize from '@ckeditor/ckeditor5-font/theme/icons/font-size.svg';
 
+import heading1 from '@ckeditor/ckeditor5-heading/theme/icons/heading1.svg';
+import heading2 from '@ckeditor/ckeditor5-heading/theme/icons/heading2.svg';
+import heading3 from '@ckeditor/ckeditor5-heading/theme/icons/heading3.svg';
+
 import marker from '@ckeditor/ckeditor5-highlight/theme/icons/marker.svg';
 import pen from '@ckeditor/ckeditor5-highlight/theme/icons/pen.svg';
 import eraser from '@ckeditor/ckeditor5-highlight/theme/icons/eraser.svg';
@@ -43,6 +47,8 @@ import unlink from '@ckeditor/ckeditor5-link/theme/icons/unlink.svg';
 import bulletedList from '@ckeditor/ckeditor5-list/theme/icons/bulletedlist.svg';
 import numberedList from '@ckeditor/ckeditor5-list/theme/icons/numberedlist.svg';
 
+import paragraph from '@ckeditor/ckeditor5-paragraph/theme/icons/paragraph.svg';
+
 import undo from '@ckeditor/ckeditor5-undo/theme/icons/undo.svg';
 import redo from '@ckeditor/ckeditor5-undo/theme/icons/redo.svg';
 
@@ -61,6 +67,9 @@ const icons = {
 	// font
 	fontFamily, fontSize,
 
+	// heading
+	heading1, heading2, heading3,
+
 	// highlight
 	marker, pen, eraser,
 
@@ -70,6 +79,9 @@ const icons = {
 	// list
 	bulletedList, numberedList,
 
+	// paragraph
+	paragraph,
+
 	// undo
 	undo, redo
 };