From 7f1a9f2ec88b817c66a7cdaf6eb44e1b288f43a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Go=C5=82aszewski?= Date: Fri, 7 Feb 2020 10:19:47 +0100 Subject: [PATCH 1/4] Copy-paste CSS styles for dimensions row in table cell properties view. --- theme/ckeditor5-table/tablecellproperties.css | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/theme/ckeditor5-table/tablecellproperties.css b/theme/ckeditor5-table/tablecellproperties.css index 1969759..bcd8600 100644 --- a/theme/ckeditor5-table/tablecellproperties.css +++ b/theme/ckeditor5-table/tablecellproperties.css @@ -17,5 +17,27 @@ background: none; } } + + &.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__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-cell-properties-form__height { + margin-left: var(--ck-spacing-small); + } + } } } From 6067409ee25bcd99fba388f122977dc66fcec8f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Go=C5=82aszewski?= Date: Fri, 7 Feb 2020 10:52:46 +0100 Subject: [PATCH 2/4] Move padding to dimensions row. --- theme/ckeditor5-table/tablecellproperties.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/theme/ckeditor5-table/tablecellproperties.css b/theme/ckeditor5-table/tablecellproperties.css index bcd8600..16e823b 100644 --- a/theme/ckeditor5-table/tablecellproperties.css +++ b/theme/ckeditor5-table/tablecellproperties.css @@ -12,6 +12,13 @@ width: 50%; } + + &.ck-table-cell-properties-form__dimensions-row, + &.ck-table-cell-properties-form__padding-row { + padding-left: 0; + padding-right: 0; + } + &.ck-table-cell-properties-form__alignment-row { & .ck.ck-toolbar { background: none; From 496c31756a93be15ccfbe71e16b5f05a7685158c Mon Sep 17 00:00:00 2001 From: Aleksander Nowodzinski Date: Fri, 7 Feb 2020 15:34:21 +0100 Subject: [PATCH 3/4] Minor adjustments to table property form styles. --- theme/ckeditor5-table/tablecellproperties.css | 13 +++++-------- theme/ckeditor5-table/tableproperties.css | 3 +-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/theme/ckeditor5-table/tablecellproperties.css b/theme/ckeditor5-table/tablecellproperties.css index 16e823b..8067836 100644 --- a/theme/ckeditor5-table/tablecellproperties.css +++ b/theme/ckeditor5-table/tablecellproperties.css @@ -7,16 +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-left: 0; - padding-right: 0; + padding: 0; } &.ck-table-cell-properties-form__alignment-row { @@ -25,6 +18,10 @@ } } + & .ck-table-cell-properties-form__padding-row { + width: 35%; + } + &.ck-table-cell-properties-form__dimensions-row { & .ck-labeled-view > .ck-label { font-size: 10px; diff --git a/theme/ckeditor5-table/tableproperties.css b/theme/ckeditor5-table/tableproperties.css index e1faf6f..130c335 100644 --- a/theme/ckeditor5-table/tableproperties.css +++ b/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 { From a585a3cc8d79a110b74f264b091a5a4007e70767 Mon Sep 17 00:00:00 2001 From: Aleksander Nowodzinski Date: Fri, 7 Feb 2020 15:44:59 +0100 Subject: [PATCH 4/4] Unified the dimensions operator styles across table and table cell forms. --- theme/ckeditor5-table/tablecellproperties.css | 8 -------- theme/ckeditor5-table/tableform.css | 14 ++++++++++++++ theme/ckeditor5-table/tableproperties.css | 8 -------- 3 files changed, 14 insertions(+), 16 deletions(-) create mode 100644 theme/ckeditor5-table/tableform.css diff --git a/theme/ckeditor5-table/tablecellproperties.css b/theme/ckeditor5-table/tablecellproperties.css index 8067836..08a8f9e 100644 --- a/theme/ckeditor5-table/tablecellproperties.css +++ b/theme/ckeditor5-table/tablecellproperties.css @@ -31,14 +31,6 @@ margin-right: var(--ck-spacing-small); } - & .ck-table-cell-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-cell-properties-form__height { margin-left: var(--ck-spacing-small); } diff --git a/theme/ckeditor5-table/tableform.css b/theme/ckeditor5-table/tableform.css new file mode 100644 index 0000000..853d812 --- /dev/null +++ b/theme/ckeditor5-table/tableform.css @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license + */ + +.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); + } +} diff --git a/theme/ckeditor5-table/tableproperties.css b/theme/ckeditor5-table/tableproperties.css index 130c335..320e68b 100644 --- a/theme/ckeditor5-table/tableproperties.css +++ b/theme/ckeditor5-table/tableproperties.css @@ -21,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); }