Merge branch 'master' into t/ckeditor5-theme-lark/206

ckeditor · Nov 19, 2018 · 0a5cc5e · 0a5cc5e
2 parents 4f3c2e0 + 671e1b8
commit 0a5cc5e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/tests/manual/imageupload.js b/tests/manual/imageupload.js
@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* globals document, console */
+/* globals window, document, console */
 
 import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor';
 import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
@@ -36,6 +36,8 @@ ClassicEditor
 		}
 	} )
 	.then( editor => {
+		window.editor = editor;
+
 		// Register fake adapter.
 		editor.plugins.get( 'FileRepository' ).createUploadAdapter = loader => {
 			const adapterMock = new UploadAdapterMock( loader );

diff --git a/theme/image.css b/theme/image.css
@@ -7,6 +7,9 @@
 	clear: both;
 	text-align: center;
 
+	/* Make sure there is some space between the content and the image. */
+	margin: 1em 0;
+
 	& > img {
 		/* Prevent unnecessary margins caused by line-height (see #44). */
 		display: block;