Преглед изворни кода

Merge branch 'master' into ckeditor5/t/1214

Piotrek Koszuliński пре 7 година
родитељ
комит
b207f1797f

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

@@ -1,6 +1,30 @@
 Changelog
 =========
 
+## [12.0.0](https://github.com/ckeditor/ckeditor5-theme-lark/compare/v11.1.0...v12.0.0) (2018-12-05)
+
+### Features
+
+* Implemented the `.ck-labeled-input__status` for labeled input's tips and errors. Replaced the `.ck-labeled-input__error` class with `.ck-labeled-input__status_error`. Fixed breaking layout when the status is longer than the labeled input (see [ckeditor/ckeditor5-media-embed#35](https://github.com/ckeditor/ckeditor5-media-embed/issues/35)). ([26215d5](https://github.com/ckeditor/ckeditor5-theme-lark/commit/26215d5))
+* Introduced the `ck-media-phone` RWD mixin that outputs a `@media` query. Improved responsiveness of media embed, link, and image form views in narrow viewports (see [ckeditor/ckeditor5#416](https://github.com/ckeditor/ckeditor5/issues/416)). ([305a745](https://github.com/ckeditor/ckeditor5-theme-lark/commit/305a745))
+
+### Bug fixes
+
+* Improved visibility of selected link inside table cells. Closes [ckeditor/ckeditor5-link#204](https://github.com/ckeditor/ckeditor5-link/issues/204). ([3a89e1a](https://github.com/ckeditor/ckeditor5-theme-lark/commit/3a89e1a))
+* Only override the `fill` for icons that do not declare one. Closes [#206](https://github.com/ckeditor/ckeditor5-theme-lark/issues/206). ([6c690a9](https://github.com/ckeditor/ckeditor5-theme-lark/commit/6c690a9))
+
+  Thanks to [@michaeldjeffrey](https://github.com/michaeldjeffrey)!
+* The visual effects should be disabled on a widget when the editor is in the read-only mode. Closes https://github.com/ckeditor/ckeditor5/issues/1261. ([41d7d1e](https://github.com/ckeditor/ckeditor5-theme-lark/commit/41d7d1e))
+
+### Other changes
+
+* Moved widget spacing styles to respective content styles in packages. Closes [#209](https://github.com/ckeditor/ckeditor5-theme-lark/issues/209). ([2418242](https://github.com/ckeditor/ckeditor5-theme-lark/commit/2418242))
+
+### BREAKING CHANGES
+
+* The `.ck-labeled-input__error` class has been replaced with `.ck-labeled-input__status_error`.
+
+
 ## [11.1.0](https://github.com/ckeditor/ckeditor5-theme-lark/compare/v11.0.0...v11.1.0) (2018-10-08)
 
 ### Features

+ 1 - 1
packages/ckeditor5-theme-lark/docs/_snippets/examples/theme-lark.js

@@ -16,7 +16,7 @@ ClassicEditor
 		plugins: [ ArticlePluginSet, EasyImage ],
 		toolbar: {
 			items: [ 'heading', '|', 'bold', 'italic', 'link', 'bulletedList', 'numberedList', 'blockQuote', 'undo', 'redo' ],
-			viewportTopOffset: 100
+			viewportTopOffset: window.getViewportTopOffsetConfig()
 		},
 		image: {
 			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]

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

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-theme-lark",
-  "version": "11.1.0",
+  "version": "12.0.0",
   "description": "A bright theme for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -9,28 +9,28 @@
     "ckeditor5-theme"
   ],
   "dependencies": {
-    "@ckeditor/ckeditor5-ui": "^11.1.0"
+    "@ckeditor/ckeditor5-ui": "^11.2.0"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-alignment": "^10.0.3",
-    "@ckeditor/ckeditor5-basic-styles": "^10.0.3",
-    "@ckeditor/ckeditor5-cloud-services": "^10.1.0",
-    "@ckeditor/ckeditor5-core": "^11.0.1",
-    "@ckeditor/ckeditor5-editor-balloon": "^11.0.1",
-    "@ckeditor/ckeditor5-editor-classic": "^11.0.1",
-    "@ckeditor/ckeditor5-easy-image": "^10.0.3",
-    "@ckeditor/ckeditor5-font": "^10.0.3",
-    "@ckeditor/ckeditor5-heading": "^10.1.0",
-    "@ckeditor/ckeditor5-highlight": "^10.0.3",
-    "@ckeditor/ckeditor5-link": "^10.0.4",
-    "@ckeditor/ckeditor5-list": "^11.0.2",
-    "@ckeditor/ckeditor5-media-embed": "^10.0.0",
-    "@ckeditor/ckeditor5-paragraph": "^10.0.3",
-    "@ckeditor/ckeditor5-undo": "^10.0.3",
-    "@ckeditor/ckeditor5-utils": "^11.0.0",
-    "@ckeditor/ckeditor5-table": "^11.0.0",
+    "@ckeditor/ckeditor5-alignment": "^10.0.4",
+    "@ckeditor/ckeditor5-basic-styles": "^10.1.0",
+    "@ckeditor/ckeditor5-cloud-services": "^10.1.1",
+    "@ckeditor/ckeditor5-core": "^11.1.0",
+    "@ckeditor/ckeditor5-editor-balloon": "^11.0.2",
+    "@ckeditor/ckeditor5-editor-classic": "^11.0.2",
+    "@ckeditor/ckeditor5-easy-image": "^10.0.4",
+    "@ckeditor/ckeditor5-font": "^10.0.4",
+    "@ckeditor/ckeditor5-heading": "^10.1.1",
+    "@ckeditor/ckeditor5-highlight": "^10.0.4",
+    "@ckeditor/ckeditor5-link": "^10.1.0",
+    "@ckeditor/ckeditor5-list": "^11.0.3",
+    "@ckeditor/ckeditor5-media-embed": "^10.1.0",
+    "@ckeditor/ckeditor5-paragraph": "^10.0.4",
+    "@ckeditor/ckeditor5-undo": "^10.0.4",
+    "@ckeditor/ckeditor5-utils": "^11.1.0",
+    "@ckeditor/ckeditor5-table": "^11.0.1",
     "eslint": "^5.5.0",
-    "eslint-config-ckeditor5": "^1.0.7",
+    "eslint-config-ckeditor5": "^1.0.9",
     "husky": "^0.14.3",
     "lint-staged": "^7.0.0"
   },

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

@@ -18,6 +18,8 @@ import italic from '@ckeditor/ckeditor5-basic-styles/theme/icons/italic.svg';
 import underline from '@ckeditor/ckeditor5-basic-styles/theme/icons/underline.svg';
 import code from '@ckeditor/ckeditor5-basic-styles/theme/icons/code.svg';
 import strikethrough from '@ckeditor/ckeditor5-basic-styles/theme/icons/strikethrough.svg';
+import subscript from '@ckeditor/ckeditor5-basic-styles/theme/icons/subscript.svg';
+import superscript from '@ckeditor/ckeditor5-basic-styles/theme/icons/superscript.svg';
 
 import cancel from '@ckeditor/ckeditor5-core/theme/icons/cancel.svg';
 import check from '@ckeditor/ckeditor5-core/theme/icons/check.svg';
@@ -70,7 +72,7 @@ const icons = {
 	alignLeft, alignCenter, alignRight, alignJustify,
 
 	// basic-styles
-	bold, italic, underline, code, strikethrough,
+	bold, italic, underline, code, strikethrough, subscript, superscript,
 
 	// core
 	check, cancel, lowVision, quote, image, objectLeft, objectCenter, objectRight, objectFullWidth, pencil, pilcrow,
@@ -119,7 +121,7 @@ for ( const i in icons ) {
 	toolbar.items.add( button );
 }
 
-toolbar.className = 'ck-editor-toolbar ck-reset_all';
+toolbar.class = 'ck-editor-toolbar ck-reset_all';
 toolbar.render();
 
 document.body.appendChild( toolbar.element );

+ 4 - 2
packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/icon/icon.css

@@ -29,7 +29,9 @@
 		/* Allows dynamic coloring of the icons. */
 		color: inherit;
 
-		/* Needed by FF. */
-		fill: currentColor;
+		&:not([fill]) {
+				/* Needed by FF. */
+				fill: currentColor;
+		}
 	}
 }

+ 1 - 1
packages/ckeditor5-theme-lark/theme/ckeditor5-ui/globals/_colors.css

@@ -102,5 +102,5 @@
 	/* -- Link -------------------------------------------------------------------------------- */
 
 	--ck-color-link-default:									hsl(240, 100%, 47%);
-	--ck-color-link-selected-background: 						hsl(201, 100%, 96%);
+	--ck-color-link-selected-background: 						hsla(201, 100%, 56%, 0.1);
 }

+ 6 - 3
packages/ckeditor5-theme-lark/theme/ckeditor5-widget/widget.css

@@ -19,9 +19,6 @@
 }
 
 .ck .ck-widget {
-	margin: var(--ck-spacing-standard) 0;
-	padding: 0;
-
 	outline-width: var(--ck-widget-outline-thickness);
 	outline-style: solid;
 	outline-color: transparent;
@@ -130,3 +127,9 @@
 		}
 	}
 }
+
+.ck-editor__editable.ck-read-only .ck-widget {
+	/* Disable visual effects of hover/active widget when CKEditor is in readOnly mode.
+	See: https://github.com/ckeditor/ckeditor5/issues/1261 */
+	--ck-widget-outline-thickness: 0;
+}