From bb6e189217927f0d793b59b57788b018f5b25945 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 13 Jan 2022 16:35:36 +0300 Subject: [PATCH 1/3] [DE PE SSE] Change styles of buttons in toolbar --- apps/common/main/resources/less/buttons.less | 7 ++++--- apps/common/main/resources/less/toolbar.less | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index cc6bce911c..bd5ffbe528 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -1,4 +1,4 @@ -@x-huge-btn-height: 48px; +@x-huge-btn-height: 52px; @x-huge-btn-icon-size: 28px; .btn { @@ -236,14 +236,15 @@ display: flex; //align-items: center; align-items: start; + height: 24px; .caption { max-width: 85px; - max-height: 22px; + max-height: 24px; text-overflow: ellipsis; white-space: pre; - line-height: 10px; + line-height: 12px; padding: 0 2px; .caret { diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index b3ffb89ad1..afa33e96ed 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -162,7 +162,7 @@ .box-controls { //height: @height-controls; // button has strange offset in IE when odd height - padding: 9px 0; + padding: 7px 0; display: flex; //background-color: #F2CBBF; @@ -273,7 +273,7 @@ font-size: 0; &:not(:first-child) { - margin-top: 8px; + margin-top: 12px; } &.font-normal { From 1fbd9a47734e422f432fa42a39c685910f2c5c72 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 13 Jan 2022 17:48:51 +0300 Subject: [PATCH 2/3] [DE PE SSE] Fix styles of toolbar buttons --- apps/common/main/resources/less/buttons.less | 4 ++-- apps/common/main/resources/less/toolbar.less | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index bd5ffbe528..23f43f89b3 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -232,7 +232,7 @@ .inner-box-caption { line-height: 18px; - padding: 0 3px; + padding: 1px 3px; display: flex; //align-items: center; align-items: start; @@ -244,7 +244,7 @@ text-overflow: ellipsis; white-space: pre; - line-height: 12px; + line-height: 11px; padding: 0 2px; .caret { diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index afa33e96ed..c7e3e89b9c 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -289,7 +289,7 @@ } &.long { - height: 48px; + height: 52px; } &.short { From 3947c42aafecb7f4e8400eb6356726e561890ac7 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 13 Jan 2022 17:55:35 +0300 Subject: [PATCH 3/3] [DE PE SSE] Fix distance between toolbar buttons --- 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 c7e3e89b9c..57c2ea63b5 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -273,7 +273,7 @@ font-size: 0; &:not(:first-child) { - margin-top: 12px; + margin-top: 8px; } &.font-normal {