浏览代码

Merge branch 'master' into t/68

Szymon Kupś 8 年之前
父节点
当前提交
bcc6901a7b
共有 2 个文件被更改,包括 3 次插入1 次删除
  1. 0 1
      packages/ckeditor5-image/theme/imagecaption/theme.scss
  2. 3 0
      packages/ckeditor5-image/theme/theme.scss

+ 0 - 1
packages/ckeditor5-image/theme/imagecaption/theme.scss

@@ -24,6 +24,5 @@
 			@include ck-box-shadow( $ck-inner-shadow );
 			background-color: ck-color( 'background' );;
 		}
-
 	}
 }

+ 3 - 0
packages/ckeditor5-image/theme/theme.scss

@@ -37,4 +37,7 @@
 
 	// Center the image if its width is smaller than content's width.
 	margin: 0 auto;
+
+	// Make sure the image never exceeds the size of the parent container (#67).
+	max-width: 100%;
 }