8
0
Эх сурвалжийг харах

Merge branch 'master' into t/ckeditor5-list/136

Aleksander Nowodzinski 6 жил өмнө
parent
commit
1d3f659809

+ 3 - 3
packages/ckeditor5-theme-lark/.travis.yml

@@ -1,9 +1,11 @@
 sudo: required
-dist: trusty
+dist: xenial
 addons:
   chrome: stable
   firefox: latest
 language: node_js
+services:
+- xvfb
 node_js:
 - '8'
 cache:
@@ -13,8 +15,6 @@ branches:
   - stable
 before_install:
 - export START_TIME=$( date +%s )
-- export DISPLAY=:99.0
-- sh -e /etc/init.d/xvfb start
 - npm i -g yarn
 install:
 - yarn add @ckeditor/ckeditor5-dev-tests

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

@@ -1,7 +1,6 @@
 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)
 [![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)

+ 1 - 1
packages/ckeditor5-theme-lark/docs/api/theme-lark.md

@@ -26,5 +26,5 @@ The source code of this package is available on GitHub in https://github.com/cke
 
 * [`@ckeditor/ckeditor5-theme-lark` on npm](https://www.npmjs.com/package/@ckeditor/ckeditor5-theme-lark)
 * [`ckeditor/ckeditor5-theme-lark` on GitHub](https://github.com/ckeditor/ckeditor5-theme-lark)
-* [Issue tracker](https://github.com/ckeditor/ckeditor5-theme-lark/issues)
+* [Issue tracker](https://github.com/ckeditor/ckeditor5/issues)
 * [Changelog](https://github.com/ckeditor/ckeditor5-theme-lark/blob/master/CHANGELOG.md)

+ 2 - 1
packages/ckeditor5-theme-lark/tests/manual/iconset.js

@@ -7,6 +7,7 @@
 
 import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
 import ToolbarView from '@ckeditor/ckeditor5-ui/src/toolbar/toolbarview';
+import Locale from '@ckeditor/ckeditor5-utils/src/locale';
 
 import alignLeft from '@ckeditor/ckeditor5-alignment/theme/icons/align-left.svg';
 import alignCenter from '@ckeditor/ckeditor5-alignment/theme/icons/align-center.svg';
@@ -118,7 +119,7 @@ const icons = {
 	undo, redo
 };
 
-const toolbar = new ToolbarView();
+const toolbar = new ToolbarView( new Locale() );
 
 for ( const i in icons ) {
 	const button = new ButtonView();