Browse Source

Pull request #3154: 无JIRA feat: 复选下拉框内水印自适应

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit 'c0799665318638fa68868ea92f9f962c785835a6':
  无JIRA feat: 复选下拉框内水印自适应
  无JIRA feat: 复选下拉框内水印自适应
es6
Dailer-刘荣歆 2 years ago
parent
commit
800d352f51
  1. 7
      src/less/base/single/editor/editor.textarea.less
  2. 3
      src/less/widget/year/popup.year.less

7
src/less/base/single/editor/editor.textarea.less

@ -6,10 +6,11 @@
white-space: pre-wrap; white-space: pre-wrap;
word-break: break-all; word-break: break-all;
font-size: @font-size-12; font-size: @font-size-12;
font-size: calc(var(--css-scale, 1) * @font-size-12);
line-height: 21px; line-height: 21px;
& { line-height: calc(var(--css-scale, 1) * 21px);
border: none;
} border: none;
} }
& .textarea-watermark{ & .textarea-watermark{
max-height: 100%; max-height: 100%;

3
src/less/widget/year/popup.year.less

@ -2,7 +2,6 @@
.bi-year-popup { .bi-year-popup {
& .year-popup-navigation { & .year-popup-navigation {
line-height: 30px;
& > .center-element { & > .center-element {
border-left: 1px solid @color-bi-border-year-popup; border-left: 1px solid @color-bi-border-year-popup;
} }
@ -26,4 +25,4 @@
} }
} }
} }
} }

Loading…
Cancel
Save