diff --git a/packages/devextreme/scss/widgets/base/textEditor/_mixins.scss b/packages/devextreme/scss/widgets/base/textEditor/_mixins.scss index 5aa540c7b390..fde79d382c1a 100644 --- a/packages/devextreme/scss/widgets/base/textEditor/_mixins.scss +++ b/packages/devextreme/scss/widgets/base/textEditor/_mixins.scss @@ -217,7 +217,9 @@ margin-top: $label-offset-y; &.dx-daterangebox { - .dx-label { + .dx-label { + position: relative; + &::before { content: ''; width: 100%; @@ -333,7 +335,7 @@ $texteditor-label-line-height, $texteditor-label-top-offset, $texteditor-font-size, - $texteditor-label-empty-height, + $texteditor-empty-label-height, $texteditor-empty-label-line-height, $texteditor-filled-input-horizontal-padding, $texteditor-filled-input-with-label-top-padding, @@ -375,7 +377,7 @@ .dx-texteditor-label { transition: $texteditor-label-transition; font-size: $texteditor-font-size; - height: $texteditor-label-empty-height; + height: $texteditor-empty-label-height; line-height: $texteditor-empty-label-line-height; top: 50%; margin-top: math.div(-$texteditor-label-height, 2); @@ -421,6 +423,8 @@ $texteditor-label-line-height, $texteditor-label-top-offset, $texteditor-font-size, + $texteditor-empty-label-height, + $texteditor-empty-label-line-height, $texteditor-with-label-input-top-padding, $texteditor-with-label-input-bottom-padding, ) { @@ -454,8 +458,8 @@ transition: $texteditor-label-transition; transform: translate(0, 0); font-size: $texteditor-font-size; - height: $texteditor-label-height; - line-height: $texteditor-label-line-height; + height: $texteditor-empty-label-height; + line-height: $texteditor-empty-label-line-height; top: 50%; margin-top: math.div(-$texteditor-label-height, 2); } diff --git a/packages/devextreme/scss/widgets/fluent/textEditor/_index.scss b/packages/devextreme/scss/widgets/fluent/textEditor/_index.scss index 2da927d754aa..71c5e79aa34d 100644 --- a/packages/devextreme/scss/widgets/fluent/textEditor/_index.scss +++ b/packages/devextreme/scss/widgets/fluent/textEditor/_index.scss @@ -390,6 +390,8 @@ $fluent-filled-texteditor-spin-button-horizontal-padding: $fluent-filled-textedi $fluent-texteditor-label-font-size, $fluent-texteditor-label-top-offset, $fluent-texteditor-font-size, + $fluent-texteditor-font-size, + $fluent-texteditor-font-size, $fluent-standard-texteditor-with-label-input-top-padding, $fluent-standard-texteditor-with-label-input-bottom-padding, ); diff --git a/packages/devextreme/scss/widgets/generic/textEditor/_index.scss b/packages/devextreme/scss/widgets/generic/textEditor/_index.scss index 606e5123ec3b..bc2af2f85e0d 100644 --- a/packages/devextreme/scss/widgets/generic/textEditor/_index.scss +++ b/packages/devextreme/scss/widgets/generic/textEditor/_index.scss @@ -270,6 +270,8 @@ $generic-texteditor-invalid-badge-size: $generic-invalid-badge-size + 2 * $gener $generic-base-line-height, 0, $generic-base-font-size, + $generic-base-inline-block-height, + $generic-base-line-height, $generic-texteditor-underlined-input-with-label-top-padding, $generic-texteditor-underlined-input-with-label-bottom-padding, ); diff --git a/packages/devextreme/scss/widgets/material/textEditor/_index.scss b/packages/devextreme/scss/widgets/material/textEditor/_index.scss index 391bb270b2c0..ed02a5e2924e 100644 --- a/packages/devextreme/scss/widgets/material/textEditor/_index.scss +++ b/packages/devextreme/scss/widgets/material/textEditor/_index.scss @@ -390,6 +390,8 @@ $material-filled-texteditor-spin-button-horizontal-padding: $material-filled-tex $material-texteditor-label-font-size, $material-texteditor-label-top-offset, $material-texteditor-font-size, + $material-texteditor-font-size, + $material-texteditor-font-size, $material-standard-texteditor-with-label-input-top-padding, $material-standard-texteditor-with-label-input-bottom-padding, ); diff --git a/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=floating-styleMode=outlined (generic-light).png b/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=floating-styleMode=outlined (generic-light).png index c58a6205d754..9cf887158eef 100644 Binary files a/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=floating-styleMode=outlined (generic-light).png and b/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=floating-styleMode=outlined (generic-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=floating-styleMode=outlined (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=floating-styleMode=outlined (material-blue-light).png index 68cfe6b41bdb..9103f3a99eb5 100644 Binary files a/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=floating-styleMode=outlined (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=floating-styleMode=outlined (material-blue-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=floating-styleMode=underlined (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=floating-styleMode=underlined (material-blue-light).png index 80c05e6fea91..7cad32f01f79 100644 Binary files a/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=floating-styleMode=underlined (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=floating-styleMode=underlined (material-blue-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=static-styleMode=outlined (generic-light).png b/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=static-styleMode=outlined (generic-light).png index 063f1bd6aca3..8519f42373bb 100644 Binary files a/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=static-styleMode=outlined (generic-light).png and b/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=static-styleMode=outlined (generic-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=static-styleMode=outlined (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=static-styleMode=outlined (material-blue-light).png index 6fafa0349163..74e744a44cef 100644 Binary files a/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=static-styleMode=outlined (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=static-styleMode=outlined (material-blue-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=static-styleMode=underlined (generic-light).png b/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=static-styleMode=underlined (generic-light).png index 01e24c1781d4..bbd228a666b9 100644 Binary files a/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=static-styleMode=underlined (generic-light).png and b/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=static-styleMode=underlined (generic-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=static-styleMode=underlined (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=static-styleMode=underlined (material-blue-light).png index c0bc03e827fe..52ea534c6ba5 100644 Binary files a/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=static-styleMode=underlined (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/editors/lookup/etalons/Lookup label with labelMode=static-styleMode=underlined (material-blue-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/editors/textBox/etalons/Textbox render stylingMode=underlined (generic-light).png b/packages/devextreme/testing/testcafe/tests/editors/textBox/etalons/Textbox render stylingMode=underlined (generic-light).png index d3b6cd71d1ea..f792bb491c96 100644 Binary files a/packages/devextreme/testing/testcafe/tests/editors/textBox/etalons/Textbox render stylingMode=underlined (generic-light).png and b/packages/devextreme/testing/testcafe/tests/editors/textBox/etalons/Textbox render stylingMode=underlined (generic-light).png differ diff --git a/packages/devextreme/testing/testcafe/tests/editors/textBox/etalons/Textbox render stylingMode=underlined (material-blue-light).png b/packages/devextreme/testing/testcafe/tests/editors/textBox/etalons/Textbox render stylingMode=underlined (material-blue-light).png index d7f5aae416b5..48dff4676fd2 100644 Binary files a/packages/devextreme/testing/testcafe/tests/editors/textBox/etalons/Textbox render stylingMode=underlined (material-blue-light).png and b/packages/devextreme/testing/testcafe/tests/editors/textBox/etalons/Textbox render stylingMode=underlined (material-blue-light).png differ