From 6379922b0cb729e9c8abdc135de12edd71dd4d13 Mon Sep 17 00:00:00 2001 From: Alexey Koshelev Date: Fri, 30 May 2025 14:53:49 +0300 Subject: [PATCH] [SSE] Fix cell editor height --- apps/common/main/resources/less/colors-table-ie-fix.less | 1 + apps/common/main/resources/less/colors-table-white-dark.less | 5 +++++ apps/common/main/resources/less/colors-table-white.less | 1 + apps/common/main/resources/less/colors-table.less | 2 ++ apps/spreadsheeteditor/main/resources/less/celleditor.less | 4 ++-- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/apps/common/main/resources/less/colors-table-ie-fix.less b/apps/common/main/resources/less/colors-table-ie-fix.less index 5c28a14ff4..87db32b891 100644 --- a/apps/common/main/resources/less/colors-table-ie-fix.less +++ b/apps/common/main/resources/less/colors-table-ie-fix.less @@ -99,6 +99,7 @@ @celleditor-border-width-ie: 0px; @celleditor-input-border-ie: 1px solid #E1E1E1; @celleditor-input-border-radius-ie: 4px; +@celleditor-cell-name-height-ie: 24px; @celleditor-cell-name-border-right-ie: 1px solid #E1E1E1; @celleditor-func-label-margin-left-ie: 1px; diff --git a/apps/common/main/resources/less/colors-table-white-dark.less b/apps/common/main/resources/less/colors-table-white-dark.less index b8b6431913..71ff176873 100644 --- a/apps/common/main/resources/less/colors-table-white-dark.less +++ b/apps/common/main/resources/less/colors-table-white-dark.less @@ -200,6 +200,11 @@ --celleditor-height: 24px; --celleditor-line-height: 20px; --celleditor-border-width: 0px; + --celleditor-input-border: var(--scaled-one-pixel, 1px) solid var(--border-fill-input); + --celleditor-input-border-radius: var(--border-radius-form-control); + --celleditor-cell-name-height: calc(var(--celleditor-height) + (1px - 1px/var(--pixel-ratio-factor,1))); + --celleditor-cell-name-border-right: var(--scaled-one-pixel, 1px) solid var(--border-fill-input); + --celleditor-func-label-margin-left: 1px; --x-small-btn-size: 24px; --x-small-btn-icon-size: 24px; diff --git a/apps/common/main/resources/less/colors-table-white.less b/apps/common/main/resources/less/colors-table-white.less index 117fac7a02..db7825f40c 100644 --- a/apps/common/main/resources/less/colors-table-white.less +++ b/apps/common/main/resources/less/colors-table-white.less @@ -204,6 +204,7 @@ --celleditor-border-width: 0px; --celleditor-input-border: var(--scaled-one-pixel, 1px) solid var(--border-fill-input); --celleditor-input-border-radius: var(--border-radius-form-control); + --celleditor-cell-name-height: calc(var(--celleditor-height) + (1px - 1px/var(--pixel-ratio-factor,1))); --celleditor-cell-name-border-right: var(--scaled-one-pixel, 1px) solid var(--border-fill-input); --celleditor-func-label-margin-left: 1px; diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less index d194373975..5d64850caa 100644 --- a/apps/common/main/resources/less/colors-table.less +++ b/apps/common/main/resources/less/colors-table.less @@ -260,6 +260,7 @@ --celleditor-border-width: var(--scaled-one-pixel, 1px); --celleditor-input-border: 0 none; --celleditor-input-border-radius: 0; + --celleditor-cell-name-height: calc(var(--celleditor-height) - var(--celleditor-border-width) + (1px - 1px/var(--pixel-ratio-factor,1))); --celleditor-cell-name-border-right: var(--scaled-one-pixel, 1px) solid var(--border-toolbar); --celleditor-func-label-margin-left: -3px; @@ -520,6 +521,7 @@ @celleditor-border-width: var(--celleditor-border-width); @celleditor-input-border: var(--celleditor-input-border); @celleditor-input-border-radius: var(--celleditor-input-border-radius); +@celleditor-cell-name-height: var(--celleditor-cell-name-height); @celleditor-cell-name-border-right: var(--celleditor-cell-name-border-right); @celleditor-func-label-margin-left: var(--celleditor-func-label-margin-left); diff --git a/apps/spreadsheeteditor/main/resources/less/celleditor.less b/apps/spreadsheeteditor/main/resources/less/celleditor.less index 143771fc1c..e3863402ad 100644 --- a/apps/spreadsheeteditor/main/resources/less/celleditor.less +++ b/apps/spreadsheeteditor/main/resources/less/celleditor.less @@ -18,8 +18,8 @@ #ce-cell-name { width: 100px; - height: calc(@celleditor-height-ie - @celleditor-border-width-ie); - height: calc(@celleditor-height - var(--celleditor-border-width) + (1px - 1px/var(--pixel-ratio-factor,1))); + height: @celleditor-cell-name-height-ie; + height: @celleditor-cell-name-height; padding: 0px 19px 0 4px; vertical-align: top; display: inline-block;