浏览代码

Merge branch 'master' into i/6131

# Conflicts:
#	theme/ckeditor5-table/tableform.css
Maciej Gołaszewski 5 年之前
父节点
当前提交
3783f46e3b

+ 21 - 3
packages/ckeditor5-theme-lark/theme/ckeditor5-table/tablecellproperties.css

@@ -7,9 +7,9 @@
 	width: 320px;
 
 	& .ck-form__row {
-		& .ck-table-cell-properties-form__background,
-		& .ck-table-cell-properties-form__padding {
-			width: 50%;
+		&.ck-table-cell-properties-form__dimensions-row,
+		&.ck-table-cell-properties-form__padding-row {
+			padding: 0;
 		}
 
 		&.ck-table-cell-properties-form__alignment-row {
@@ -17,5 +17,23 @@
 				background: none;
 			}
 		}
+
+		& .ck-table-cell-properties-form__padding-row {
+			width: 35%;
+		}
+
+		&.ck-table-cell-properties-form__dimensions-row {
+			& .ck-labeled-view > .ck-label {
+				font-size: 10px;
+			}
+
+			& .ck-table-cell-properties-form__width {
+				margin-right: var(--ck-spacing-small);
+			}
+
+			& .ck-table-cell-properties-form__height {
+				margin-left: var(--ck-spacing-small);
+			}
+		}
 	}
 }

+ 8 - 0
packages/ckeditor5-theme-lark/theme/ckeditor5-table/tableform.css

@@ -11,6 +11,14 @@
 }
 
 .ck.ck-table-form {
+	& .ck-table-form__dimension-operator {
+		margin: 0;
+		align-self: start;
+		display: inline-block;
+		height: var(--ck-ui-component-min-height);
+		line-height: var(--ck-ui-component-min-height);
+	}
+
 	& .ck.ck-labeled-view {
 		& .ck.ck-labeled-view__status {
 			@mixin ck-rounded-corners;

+ 1 - 10
packages/ckeditor5-theme-lark/theme/ckeditor5-table/tableproperties.css

@@ -9,8 +9,7 @@
 	& .ck-form__row {
 		&.ck-table-properties-form__dimensions-row,
 		&.ck-table-properties-form__alignment-row {
-			padding-left: 0;
-			padding-right: 0;
+			padding: 0;
 		}
 
 		&.ck-table-properties-form__dimensions-row {
@@ -22,14 +21,6 @@
 				margin-right: var(--ck-spacing-small);
 			}
 
-			& .ck-table-properties-form__dimension-operator {
-				margin: 0;
-				align-self: start;
-				display: inline-block;
-				height: var(--ck-ui-component-min-height);
-				line-height: var(--ck-ui-component-min-height);
-			}
-
 			& .ck-table-properties-form__height {
 				margin-left: var(--ck-spacing-small);
 			}