8
0
فهرست منبع

Merge branch 'ckeditor5/t/389'

Piotrek Koszuliński 9 سال پیش
والد
کامیت
09eb9b51eb

+ 2 - 6
packages/ckeditor5-theme-lark/.travis.yml

@@ -15,11 +15,7 @@ before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 install:
-  - npm install
-  - npm install @ckeditor/ckeditor5-dev-tests
-  - npm install codeclimate-test-reporter
+  - npm install gulp mgit2 lerna @ckeditor/ckeditor5-dev-tests @ckeditor/ckeditor5-dev-lint
+  - ckeditor5-dev-tests-install-dependencies
 script:
   - node_modules/.bin/ckeditor5-dev-tests-travis
-after_success:
-  - node_modules/.bin/codeclimate-test-reporter < build/.automated-tests/coverage/lcov.info
-

+ 6 - 4
packages/ckeditor5-theme-lark/package.json

@@ -1,13 +1,15 @@
 {
-  "name": "ckeditor5-theme-lark",
+  "name": "@ckeditor/ckeditor5-theme-lark",
   "version": "0.5.0",
   "description": "A bright theme for CKEditor 5.",
   "keywords": [],
-  "dependencies": {},
+  "dependencies": {
+    "@ckeditor/ckeditor5-ui": "*"
+  },
   "devDependencies": {
+    "@ckeditor/ckeditor5-basic-styles": "*",
     "@ckeditor/ckeditor5-dev-lint": "^2.0.0",
-    "ckeditor5-ui": "ckeditor/ckeditor5-ui",
-    "ckeditor5-utils": "ckeditor/ckeditor5-utils",
+    "@ckeditor/ckeditor5-utils": "*",
     "gulp": "^3.9.0",
     "guppy-pre-commit": "^0.4.0"
   },

+ 11 - 11
packages/ckeditor5-theme-lark/tests/manual/theme.js

@@ -5,20 +5,20 @@
 
 /* globals document */
 
-import testUtils from 'ckeditor5-ui/tests/_utils/utils';
+import testUtils from '@ckeditor/ckeditor5-ui/tests/_utils/utils';
 
-import Collection from 'ckeditor5-utils/src/collection';
-import Model from 'ckeditor5-ui/src/model';
-import View from 'ckeditor5-ui/src/view';
-import Template from 'ckeditor5-ui/src/template';
+import Collection from '@ckeditor/ckeditor5-utils/src/collection';
+import Model from '@ckeditor/ckeditor5-ui/src/model';
+import View from '@ckeditor/ckeditor5-ui/src/view';
+import Template from '@ckeditor/ckeditor5-ui/src/template';
 
-import IconView from 'ckeditor5-ui/src/icon/iconview';
-import ButtonView from 'ckeditor5-ui/src/button/buttonview';
-import createListDropdown from 'ckeditor5-ui/src/dropdown/list/createlistdropdown';
-import ToolbarView from 'ckeditor5-ui/src/toolbar/toolbarview';
+import IconView from '@ckeditor/ckeditor5-ui/src/icon/iconview';
+import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
+import createListDropdown from '@ckeditor/ckeditor5-ui/src/dropdown/list/createlistdropdown';
+import ToolbarView from '@ckeditor/ckeditor5-ui/src/toolbar/toolbarview';
 
-import boldIcon from 'ckeditor5-basic-styles/theme/icons/bold.svg';
-import italicIcon from 'ckeditor5-basic-styles/theme/icons/italic.svg';
+import boldIcon from '@ckeditor/ckeditor5-basic-styles/theme/icons/bold.svg';
+import italicIcon from '@ckeditor/ckeditor5-basic-styles/theme/icons/italic.svg';
 
 import '../../theme/theme.scss';
 

+ 1 - 1
packages/ckeditor5-theme-lark/theme/theme.scss

@@ -2,7 +2,7 @@
 // For licensing, see LICENSE.md or http://ckeditor.com/license
 
 // Lark is based on the UI wireframe theme
-@import '~ckeditor5-ui/theme/theme';
+@import '~@ckeditor/ckeditor5-ui/theme/theme';
 
 @import 'helpers/colors';
 @import 'helpers/fonts';