浏览代码

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

Piotrek Koszuliński 7 年之前
父节点
当前提交
d75fab797a

+ 3 - 0
packages/ckeditor5-image/.travis.yml

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

+ 1 - 1
packages/ckeditor5-image/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-image/src/imagestyle.js

@@ -69,7 +69,7 @@ export default class ImageStyle extends Plugin {
  *				{ name: 'full', icon: 'right' },
  *
  *				// This will customize the icon, title and CSS class of the default "side" style.
- *				{ name: 'side', icon: customIcon, title: 'My side style', class: 'custom-side-image' }
+ *				{ name: 'side', icon: customIcon, title: 'My side style', className: 'custom-side-image' }
  *			]
  *		};
  *

+ 18 - 0
packages/ckeditor5-image/theme/textalternativeform.css

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