Selaa lähdekoodia

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

Aleksander Nowodzinski 7 vuotta sitten
vanhempi
commit
69573fa001
2 muutettua tiedostoa jossa 20 lisäystä ja 9 poistoa
  1. 11 0
      packages/ckeditor5-font/CHANGELOG.md
  2. 9 9
      packages/ckeditor5-font/package.json

+ 11 - 0
packages/ckeditor5-font/CHANGELOG.md

@@ -1,6 +1,17 @@
 Changelog
 =========
 
+## [10.0.1](https://github.com/ckeditor/ckeditor5-font/compare/v10.0.0...v10.0.1) (2018-06-21)
+
+### Bug fixes
+
+* Ensured that font size's and font family's markup is always "outside" markup of other typical inline features, especially those changing background color. Thanks to that, the entire area of styled text will be correctly colored. Closes [ckeditor/ckeditor5-highlight#17](https://github.com/ckeditor/ckeditor5-highlight/issues/17). ([3b8b6dc](https://github.com/ckeditor/ckeditor5-font/commit/3b8b6dc))
+
+### Other changes
+
+* Updated translations.
+
+
 ## [10.0.0](https://github.com/ckeditor/ckeditor5-font/compare/v1.0.0-beta.4...v10.0.0) (2018-04-25)
 
 ### Other changes

+ 9 - 9
packages/ckeditor5-font/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-font",
-  "version": "10.0.0",
+  "version": "10.0.1",
   "description": "Font feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -9,16 +9,16 @@
     "ckeditor5-feature"
   ],
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "^10.0.0",
-    "@ckeditor/ckeditor5-engine": "^10.0.0",
-    "@ckeditor/ckeditor5-ui": "^10.0.0",
-    "@ckeditor/ckeditor5-utils": "^10.0.0"
+    "@ckeditor/ckeditor5-core": "^10.1.0",
+    "@ckeditor/ckeditor5-engine": "^10.1.0",
+    "@ckeditor/ckeditor5-ui": "^10.1.0",
+    "@ckeditor/ckeditor5-utils": "^10.1.0"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-cloud-services": "^10.0.0",
-    "@ckeditor/ckeditor5-editor-classic": "^10.0.0",
-    "@ckeditor/ckeditor5-highlight": "^10.0.0",
-    "@ckeditor/ckeditor5-paragraph": "^10.0.0",
+    "@ckeditor/ckeditor5-cloud-services": "^10.0.1",
+    "@ckeditor/ckeditor5-editor-classic": "^10.0.1",
+    "@ckeditor/ckeditor5-highlight": "^10.0.1",
+    "@ckeditor/ckeditor5-paragraph": "^10.0.1",
     "eslint": "^4.15.0",
     "eslint-config-ckeditor5": "^1.0.7",
     "husky": "^0.14.3",