ソースを参照

Merge branch 'master' into i/6106

Aleksander Nowodzinski 5 年 前
コミット
d6aae5842d

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

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

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+
+@import "../mixins/_rounded.css";
+
+:root {
+	--ck-table-properties-error-arrow-size: 6px;
+	--ck-table-properties-min-error-width: 150px;
+}
+
+.ck.ck-table-form {
+	& .ck-table-form__border-row {
+		& .ck-labeled-view {
+			& > .ck-label {
+				font-size: var(--ck-font-size-tiny);
+			}
+		}
+
+		& .ck-table-form__border-style {
+			width: 80px;
+			min-width: 80px;
+		}
+
+		& .ck-table-form__border-width {
+			width: 80px;
+			min-width: 80px;
+		}
+	}
+
+	& .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;
+
+			background: var(--ck-color-base-error);
+			color: var(--ck-color-base-background);
+			padding: var(--ck-spacing-small) var(--ck-spacing-medium);
+			min-width: var(--ck-table-properties-min-error-width);
+			text-align: center;
+
+			/* The arrow pointing towards the field. */
+			&::after {
+				border-color: transparent transparent var(--ck-color-base-error) transparent;
+				border-width: 0 var(--ck-table-properties-error-arrow-size) var(--ck-table-properties-error-arrow-size) var(--ck-table-properties-error-arrow-size);
+				border-style: solid;
+			}
+
+			animation: ck-table-form-labeled-view-status-appear .15s ease both;
+		}
+
+		/* Hide the error balloon when the field is blurred. Makes the experience much more clear. */
+		& .ck-input.ck-error:not(:focus) + .ck.ck-labeled-view__status {
+			display: none;
+		}
+	}
+}
+
+@keyframes ck-table-form-labeled-view-status-appear {
+	0% {
+		opacity: 0;
+	}
+
+	100% {
+		opacity: 1;
+	}
+}

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