From 552bb272921da7d87d7a5c9bfb031cad887718f7 Mon Sep 17 00:00:00 2001 From: zsmj Date: Fri, 21 Oct 2022 19:34:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=20feat:=20=E5=A4=8D=E9=80=89?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E5=86=85=E6=B0=B4=E5=8D=B0=E8=87=AA?= =?UTF-8?q?=E9=80=82=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/single/editor/editor.textarea.less | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/less/base/single/editor/editor.textarea.less b/src/less/base/single/editor/editor.textarea.less index dc0a77a03..24554c425 100644 --- a/src/less/base/single/editor/editor.textarea.less +++ b/src/less/base/single/editor/editor.textarea.less @@ -6,10 +6,11 @@ white-space: pre-wrap; word-break: break-all; font-size: @font-size-12; + font-size: calc(var(--css-scale, @font-size-12) * 1px); line-height: 21px; - & { - border: none; - } + line-height: calc(var(--css-scale, 21) * 1px); + + border: none; } & .textarea-watermark{ max-height: 100%; From 47ecf338bde5ef54e3d687df2958dce234c243f9 Mon Sep 17 00:00:00 2001 From: zsmj Date: Fri, 21 Oct 2022 19:55:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0JIRA=20feat:=20=E5=A4=8D=E9=80=89?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E5=86=85=E6=B0=B4=E5=8D=B0=E8=87=AA?= =?UTF-8?q?=E9=80=82=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/single/editor/editor.textarea.less | 4 ++-- src/less/widget/year/popup.year.less | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/less/base/single/editor/editor.textarea.less b/src/less/base/single/editor/editor.textarea.less index 24554c425..e5e8152be 100644 --- a/src/less/base/single/editor/editor.textarea.less +++ b/src/less/base/single/editor/editor.textarea.less @@ -6,9 +6,9 @@ white-space: pre-wrap; word-break: break-all; font-size: @font-size-12; - font-size: calc(var(--css-scale, @font-size-12) * 1px); + font-size: calc(var(--css-scale, 1) * @font-size-12); line-height: 21px; - line-height: calc(var(--css-scale, 21) * 1px); + line-height: calc(var(--css-scale, 1) * 21px); border: none; } diff --git a/src/less/widget/year/popup.year.less b/src/less/widget/year/popup.year.less index 148f40508..2d9e7e133 100644 --- a/src/less/widget/year/popup.year.less +++ b/src/less/widget/year/popup.year.less @@ -2,7 +2,6 @@ .bi-year-popup { & .year-popup-navigation { - line-height: 30px; & > .center-element { border-left: 1px solid @color-bi-border-year-popup; } @@ -26,4 +25,4 @@ } } } -} \ No newline at end of file +}