Procházet zdrojové kódy

Merge branch 'master' into t/73

Aleksander Nowodzinski před 8 roky
rodič
revize
fd977c60be

+ 8 - 0
packages/ckeditor5-theme-lark/CHANGELOG.md

@@ -0,0 +1,8 @@
+Changelog
+=========
+
+## [0.6.1](https://github.com/ckeditor/ckeditor5-theme/compare/v0.6.0...v0.6.1) (2017-03-06)
+
+### Bug fixes
+
+* Toolbar separator and new line CSS classes should follow our naming guidelines. Closes [#76](https://github.com/ckeditor/ckeditor5/issues/76). ([a3d9276](https://github.com/ckeditor/ckeditor5-theme/commit/a3d9276))

+ 5 - 5
packages/ckeditor5-theme-lark/package.json

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

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

@@ -16,6 +16,7 @@ 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 ToolbarSeparatorView from '@ckeditor/ckeditor5-ui/src/toolbar/toolbarseparatorview';
 
 import boldIcon from '@ckeditor/ckeditor5-basic-styles/theme/icons/bold.svg';
 import italicIcon from '@ckeditor/ckeditor5-basic-styles/theme/icons/italic.svg';
@@ -334,19 +335,6 @@ function dropdown( {
 	return dropdown;
 }
 
-const ToolbarSeparatorView = class extends View {
-	constructor() {
-		super();
-
-		this.template = new Template( {
-			tag: 'span',
-			attributes: {
-				class: 'ck-toolbar-separator'
-			}
-		} );
-	}
-};
-
 function toolbarSeparator() {
 	return new ToolbarSeparatorView();
 }
@@ -358,7 +346,7 @@ const ToolbarNewlineView = class extends View {
 		this.template = new Template( {
 			tag: 'span',
 			attributes: {
-				class: 'ck-toolbar-newline'
+				class: 'ck-toolbar__newline'
 			}
 		} );
 	}

+ 2 - 2
packages/ckeditor5-theme-lark/theme/components/toolbar/toolbar.scss

@@ -10,14 +10,14 @@
 	@include ck-unselectable();
 	@include ck-rounded-corners();
 
-	&-separator {
+	&__separator {
 		width: 1px;
 		height: calc( 1em + 2 * #{ck-spacing( 'medium' )} );
 		vertical-align: middle;
 		background: ck-border-color();
 	}
 
-	&-newline {
+	&__newline {
 		height: ck-spacing( 'small' );
 	}