8
0
Эх сурвалжийг харах

Merge branch 'master' into t/ckeditor5-engine/1556

Maciej Gołaszewski 7 жил өмнө
parent
commit
22b51bc8f6

+ 1 - 1
packages/ckeditor5-media-embed/package.json

@@ -30,7 +30,7 @@
     "@ckeditor/ckeditor5-paragraph": "^10.0.4",
     "@ckeditor/ckeditor5-typing": "^11.0.2",
     "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"
   },

+ 2 - 2
packages/ckeditor5-media-embed/tests/mediaembedediting.js

@@ -75,7 +75,7 @@ describe( 'MediaEmbedEditing', () => {
 					} ).then( () => {
 						expect( logSpy.calledOnce ).to.equal( true );
 						expect( logSpy.firstCall.args[ 0 ] ).to.match( /^media-embed-no-provider-name:/ );
-						expect( logSpy.firstCall.args[ 1 ].provider ).to.equal( provider );
+						expect( logSpy.firstCall.args[ 1 ].provider ).to.deep.equal( provider );
 					} );
 				} );
 
@@ -330,7 +330,7 @@ describe( 'MediaEmbedEditing', () => {
 					} ).then( () => {
 						expect( logSpy.calledOnce ).to.equal( true );
 						expect( logSpy.firstCall.args[ 0 ] ).to.match( /^media-embed-no-provider-name:/ );
-						expect( logSpy.firstCall.args[ 1 ].provider ).to.equal( provider );
+						expect( logSpy.firstCall.args[ 1 ].provider ).to.deep.equal( provider );
 					} );
 				} );
 

+ 4 - 0
packages/ckeditor5-media-embed/theme/mediaembed.css

@@ -10,4 +10,8 @@
 
 	/* Make sure there is some space between the content and the media. */
 	margin: 1em 0;
+
+	/* Make sure media is not overriden with Bootstrap default `flex` value.
+	See: https://github.com/ckeditor/ckeditor5/issues/1373. */
+	display: block;
 }