From 38cc5ee7fa9937fe8624ccb63f33428bed30f194 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 20 Apr 2021 16:37:09 +0300 Subject: [PATCH 1/2] [common] fix bug 49741 --- apps/common/main/resources/less/toolbar.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 02bf64d63..75befbd5c 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -523,7 +523,7 @@ box-shadow: inset 0 0 0 @scaled-one-px-value @border-regular-control; } - &, .icon { + & { width: 21px; height: 21px; } From f3b6156ec801b9692bb8a4252496f939d414a4c8 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 20 Apr 2021 16:37:46 +0300 Subject: [PATCH 2/2] [DE] fix bug 49706 --- apps/documenteditor/main/app/view/ListSettingsDialog.js | 2 +- .../main/resources/less/advanced-settings.less | 9 ++++++++- apps/documenteditor/main/resources/less/toolbar.less | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/view/ListSettingsDialog.js b/apps/documenteditor/main/app/view/ListSettingsDialog.js index c35ab4b31..310ecda94 100644 --- a/apps/documenteditor/main/app/view/ListSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ListSettingsDialog.js @@ -131,7 +131,7 @@ define([ '', '', '', - '
', + '
', '', '', '', diff --git a/apps/documenteditor/main/resources/less/advanced-settings.less b/apps/documenteditor/main/resources/less/advanced-settings.less index 31a68d081..94b2a2c09 100644 --- a/apps/documenteditor/main/resources/less/advanced-settings.less +++ b/apps/documenteditor/main/resources/less/advanced-settings.less @@ -61,4 +61,11 @@ background-color: #fff; } - +#bulleted-list-preview { + margin-top: 2px; + height:208px; + width: 100%; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; + border: @scaled-one-px-value solid @border-regular-control; + background-color: @canvas-content-background; +} diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index 6500e36ce..c0e2b6dcd 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -214,6 +214,8 @@ .menu-list-preview { .box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie); .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control); + + background-color: @canvas-content-background; } a:hover {