浏览代码

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

# Conflicts:
#	src/converters.js
#	src/utils.js
Maciej Gołaszewski 7 年之前
父节点
当前提交
581c40405d

+ 3 - 0
packages/ckeditor5-media-embed/.travis.yml

@@ -12,6 +12,9 @@ node_js:
 - '6'
 cache:
 - node_modules
+branches:
+   except:
+   - stable
 before_install:
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start

+ 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 - 1
packages/ckeditor5-media-embed/README.md

@@ -10,7 +10,7 @@ CKEditor 5 media embed feature
 [![Dependency Status](https://david-dm.org/ckeditor/ckeditor5-media-embed/status.svg)](https://david-dm.org/ckeditor/ckeditor5-media-embed)
 [![devDependency Status](https://david-dm.org/ckeditor/ckeditor5-media-embed/dev-status.svg)](https://david-dm.org/ckeditor/ckeditor5-media-embed?type=dev)
 
-This package implements the media embed feature for CKEditor 5. You can use it to insert embeddable media such as YouTube or Vimeo videos and tweets into your rich-text content.
+This package implements the media embed feature for CKEditor 5. You can use it to insert embeddable media such as YouTube or Vimeo videos and tweets into your rich text content.
 
 ## Demo
 

文件差异内容过多而无法显示
+ 40 - 4
packages/ckeditor5-media-embed/docs/features/media-embed.md


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

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

+ 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.
  *

+ 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;
+}

+ 6 - 4
packages/ckeditor5-media-embed/theme/mediaembedediting.css

@@ -6,10 +6,6 @@
 @import "@ckeditor/ckeditor5-ui/theme/components/tooltip/mixins/_tooltip.css";
 
 .ck-media__wrapper {
-	& > *:not(.ck-media__placeholder) {
-		pointer-events: none;
-	}
-
 	& .ck-media__placeholder {
 		display: flex;
 		flex-direction: column;
@@ -43,3 +39,9 @@
 		}
 	}
 }
+
+/* Disable all mouse interaction as long as the editor is not read–only.
+   https://github.com/ckeditor/ckeditor5-media-embed/issues/58 */
+*[contenteditable=true] .ck-media__wrapper > *:not(.ck-media__placeholder) {
+	pointer-events: none;
+}

+ 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%;
+		}
+	}
 }