Browse Source

Merge branch 'master' into t/47

Kamil Piechaczek 7 years ago
parent
commit
6e1319e91e

+ 1 - 1
packages/ckeditor5-media-embed/CONTRIBUTING.md

@@ -1,4 +1,4 @@
 Contributing
 ========================================
 
-Information about contributing can be found on the following page: <https://github.com/ckeditor/ckeditor5/blob/master/CONTRIBUTING.md>.
+See the [official contributors' guide to CKEditor 5](https://ckeditor.com/docs/ckeditor5/latest/framework/guides/contributing/contributing.html) to learn more.

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

@@ -15,6 +15,7 @@
     "@ckeditor/ckeditor5-engine": "^11.0.0",
     "@ckeditor/ckeditor5-enter": "^10.1.2",
     "@ckeditor/ckeditor5-image": "^11.0.0",
+    "@ckeditor/ckeditor5-theme-lark": "^11.1.0",
     "@ckeditor/ckeditor5-ui": "^11.1.0",
     "@ckeditor/ckeditor5-utils": "^11.0.0",
     "@ckeditor/ckeditor5-undo": "^10.0.3",

+ 1 - 1
packages/ckeditor5-media-embed/src/converters.js

@@ -55,6 +55,6 @@ export function modelToViewUrlAttributeConverter( registry, options ) {
 
 		const mediaViewElement = registry.getMediaViewElement( viewWriter, url, options );
 
-		viewWriter.insert( ViewPosition.createAt( figure ), mediaViewElement );
+		viewWriter.insert( ViewPosition.createAt( figure, 0 ), mediaViewElement );
 	}
 }

+ 2 - 0
packages/ckeditor5-media-embed/src/mediaembed.js

@@ -13,6 +13,8 @@ import MediaEmbedUI from './mediaembedui';
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import Widget from '@ckeditor/ckeditor5-widget/src/widget';
 
+import '../theme/mediaembed.css';
+
 /**
  * The media embed plugin.
  *

+ 1 - 1
packages/ckeditor5-media-embed/src/utils.js

@@ -68,7 +68,7 @@ export function createMediaFigureElement( writer, registry, url, options ) {
 	// Note: The hack is a copy&paste from widget utils; it makes the figure act like it's a widget.
 	figure.getFillerOffset = getFillerOffset;
 
-	writer.insert( ViewPosition.createAt( figure ), registry.getMediaViewElement( writer, url, options ) );
+	writer.insert( ViewPosition.createAt( figure, 0 ), registry.getMediaViewElement( writer, url, options ) );
 
 	return figure;
 }

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

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
+.ck-content .media {
+	/* Don't allow floated content overlap the media.
+	https://github.com/ckeditor/ckeditor5-media-embed/issues/53 */
+	clear: both;
+}

+ 16 - 0
packages/ckeditor5-media-embed/theme/mediaform.css

@@ -3,9 +3,13 @@
  * For licensing, see LICENSE.md.
  */
 
+@import "@ckeditor/ckeditor5-theme-lark/theme/mixins/_rwd.css";
+
 .ck.ck-media-form {
 	display: flex;
 	align-items: flex-start;
+	flex-direction: row;
+	flex-wrap: nowrap;
 
 	& .ck-labeled-input {
 		display: inline-block;
@@ -14,4 +18,16 @@
 	& .ck-label {
 		display: none;
 	}
+
+	@mixin ck-media-phone {
+		flex-wrap: wrap;
+
+		& .ck-labeled-input {
+			flex-basis: 100%;
+		}
+
+		& .ck-button {
+			flex-basis: 50%;
+		}
+	}
 }