Jelajahi Sumber

Merge branch 'master' into tut/inline-widget

Maciej Gołaszewski 7 tahun lalu
induk
melakukan
835fe1197f

+ 3 - 2
docs/_snippets/features/placeholder-custom.js

@@ -3,12 +3,13 @@
  * For licensing, see LICENSE.md.
  */
 
-/* globals console, window, document */
+/* globals console, window, document, ClassicEditor */
 
-import ClassicEditor from '@ckeditor/ckeditor5-build-classic/src/ckeditor';
+import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config';
 
 ClassicEditor
 	.create( document.querySelector( '#snippet-placeholder-custom' ), {
+		cloudServices: CS_CONFIG,
 		placeholder: 'Type the content here!'
 	} )
 	.then( editor => {

+ 3 - 2
docs/_snippets/features/placeholder.js

@@ -3,12 +3,13 @@
  * For licensing, see LICENSE.md.
  */
 
-/* globals console, window, document */
+/* globals console, window, document, ClassicEditor */
 
-import ClassicEditor from '@ckeditor/ckeditor5-build-classic/src/ckeditor';
+import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config';
 
 ClassicEditor
 	.create( document.querySelector( '#snippet-placeholder' ), {
+		cloudServices: CS_CONFIG,
 		placeholder: 'Type the content here!'
 	} )
 	.then( editor => {

+ 5 - 1
docs/assets/snippet-styles.css

@@ -128,7 +128,11 @@ It breaks CKEditor 5 (see how <p><code>[]</code></p> looks). */
 	padding: 2rem;
 }
 
-#snippet-inline-editor .ck-content:not(.ck-focused) {
+/* Visually separate inline editors from example description.
+https://github.com/ckeditor/ckeditor5/issues/1545 */
+#snippet-inline-editor .ck-content:not(.ck-focused),
+#snippet-balloon-editor.ck-content:not(.ck-focused),
+#snippet-balloon-block-editor.ck-content:not(.ck-focused) {
 	border: 1px solid rgba(0, 0, 0, 0.15);
 }
 

+ 0 - 2
docs/builds/guides/frameworks/css.md

@@ -15,8 +15,6 @@ In this guide, you will learn how to address these integration issues and use th
 
 ## Compatibility with Bootstrap
 
-### Bootstrap modals
-
 We noticed that [Bootstrap](https://getbootstrap.com) modals cover the UI of the rich-text editor and break the input fields. Knowing that, you will need to take the following steps to get CKEditor 5 working in the Bootstrap environment:
 
 * Configure the `z-index` of the floating editor UI (e.g. balloons) so it is displayed over the Bootstrap overlay.

+ 2 - 0
docs/features/placeholder.md

@@ -2,6 +2,8 @@
 category: features
 ---
 
+{@snippet build-classic-source}
+
 # Editor placeholder
 
 CKEditor 5 can display a configurable placeholder text when the content is empty. The placeholder helps users locate the editor in the application and prompts to input the content. It works similarly to the native DOM [`placeholder` attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#The_placeholder_attribute) used by inputs.

+ 7 - 7
package.json

@@ -66,14 +66,14 @@
   "devDependencies": {
     "@ckeditor/ckeditor5-real-time-collaboration": "^12.0.1",
     "@ckeditor/ckeditor5-comments": "^1.0.1",
-    "@ckeditor/ckeditor5-dev-docs": "^10.0.3",
-    "@ckeditor/ckeditor5-dev-env": "^13.0.2",
-    "@ckeditor/ckeditor5-dev-tests": "^15.2.0",
-    "@ckeditor/ckeditor5-dev-utils": "^11.0.1",
-    "@ckeditor/ckeditor5-dev-webpack-plugin": "^7.0.1",
+    "@ckeditor/ckeditor5-dev-docs": "^11.0.0",
+    "@ckeditor/ckeditor5-dev-env": "^14.0.0",
+    "@ckeditor/ckeditor5-dev-tests": "^16.0.0",
+    "@ckeditor/ckeditor5-dev-utils": "^12.0.0",
+    "@ckeditor/ckeditor5-dev-webpack-plugin": "^8.0.0",
     "css-loader": "^1.0.0",
     "eslint": "^5.5.0",
-    "eslint-config-ckeditor5": "^1.0.9",
+    "eslint-config-ckeditor5": "^1.0.11",
     "glob": "^7.1.2",
     "husky": "^1.3.1",
     "lint-staged": "^7.0.0",
@@ -85,7 +85,7 @@
     "style-loader": "^0.23.0",
     "svgo": "^1.1.0",
     "uglifyjs-webpack-plugin": "^1.2.7",
-    "umberto": "^0.14.0",
+    "umberto": "^0.19.0",
     "webpack": "^4.15.0"
   },
   "engines": {

+ 4 - 1
scripts/clean-up-svg-icons.sh

@@ -7,7 +7,10 @@
 # The configuration file is located in svgo.config.json.
 #
 # Usage:
-#	npm run clean-up-svg-icons path/to/icons/*.svg
+#	yarn run clean-up-svg-icons path/to/icons/foo.svg
+#
+# To optimize the entire project:
+#	yarn clean-up-svg-icons packages/**/theme/icons
 
 for i in "$@"
 do

File diff ditekan karena terlalu besar
+ 528 - 89
yarn.lock


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini