Merge branch '25_1' of https://github.com/DevExpress/DevExtreme into 25_1

GoodDayForSurf · GoodDayForSurf · commit 831678fbbba9 · 2025-05-26T21:53:27.000+04:00
diff --git a/packages/devextreme-scss/scss/widgets/fluent/gridBase/_index.scss b/packages/devextreme-scss/scss/widgets/fluent/gridBase/_index.scss
@@ -92,9 +92,11 @@ $fluent-grid-base-group-panel-message-line-height: $fluent-button-text-line-heig
       }
 
       .dx-texteditor {
-        .dx-texteditor-input,
-        .dx-placeholder::before {
-          padding-left: $fluent-grid-base-texteditor-input-padding;
+        .dx-texteditor-container {
+          .dx-texteditor-input,
+          .dx-placeholder::before {
+            padding-left: $fluent-grid-base-texteditor-input-padding;
+          }
         }
       }
     }
diff --git a/packages/devextreme-scss/scss/widgets/material/gridBase/_index.scss b/packages/devextreme-scss/scss/widgets/material/gridBase/_index.scss
@@ -82,9 +82,11 @@ $material-grid-base-group-panel-message-line-height: $material-button-text-line-
       }
 
       .dx-texteditor {
-        .dx-texteditor-input,
-        .dx-placeholder::before {
-          padding-left: $material-grid-base-texteditor-input-padding;
+        .dx-texteditor-container {
+          .dx-texteditor-input,
+          .dx-placeholder::before {
+            padding-left: $material-grid-base-texteditor-input-padding;
+          }
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,11 @@ $fluent-grid-base-group-panel-message-line-height: $fluent-button-text-line-heig`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`.dx-texteditor {`
`95`		`- .dx-texteditor-input,`
`96`		`- .dx-placeholder::before {`
`97`		`- padding-left: $fluent-grid-base-texteditor-input-padding;`
	`95`	`+ .dx-texteditor-container {`
	`96`	`+ .dx-texteditor-input,`
	`97`	`+ .dx-placeholder::before {`
	`98`	`+ padding-left: $fluent-grid-base-texteditor-input-padding;`
	`99`	`+ }`
`98`	`100`	`}`
`99`	`101`	`}`
`100`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,9 +82,11 @@ $material-grid-base-group-panel-message-line-height: $material-button-text-line-`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`.dx-texteditor {`
`85`		`- .dx-texteditor-input,`
`86`		`- .dx-placeholder::before {`
`87`		`- padding-left: $material-grid-base-texteditor-input-padding;`
	`85`	`+ .dx-texteditor-container {`
	`86`	`+ .dx-texteditor-input,`
	`87`	`+ .dx-placeholder::before {`
	`88`	`+ padding-left: $material-grid-base-texteditor-input-padding;`
	`89`	`+ }`
`88`	`90`	`}`
`89`	`91`	`}`
`90`	`92`	`}`