Skip to content

Commit

Permalink
TextArea height should be consistent with different styling modes in …
Browse files Browse the repository at this point in the history
…Material and Fluent themes (#25861)
  • Loading branch information
EugeniyKiyashko authored Oct 23, 2023
1 parent 05ff680 commit 05ffbd5
Show file tree
Hide file tree
Showing 113 changed files with 37 additions and 8 deletions.
19 changes: 16 additions & 3 deletions packages/devextreme/scss/widgets/base/textEditor/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -478,11 +478,18 @@
&.dx-texteditor-with-label:not(.dx-texteditor-label-outside),
&.dx-texteditor-with-floating-label {
.dx-texteditor-input,
.dx-placeholder::before,
.dx-lookup-field {
.dx-placeholder::before {
padding-top: $texteditor-filled-input-with-label-top-padding;
padding-bottom: $texteditor-filled-input-with-label-bottom-padding;
}


&.dx-lookup {
.dx-lookup-field {
padding-top: $texteditor-filled-input-with-label-top-padding;
padding-bottom: $texteditor-filled-input-with-label-bottom-padding;
}
}
}

&.dx-texteditor-with-label,
Expand Down Expand Up @@ -580,11 +587,17 @@
&.dx-texteditor-with-label:not(.dx-texteditor-label-outside),
&.dx-texteditor-with-floating-label {
.dx-texteditor-input,
.dx-lookup-field,
.dx-placeholder::before {
padding-top: $texteditor-with-label-input-top-padding;
padding-bottom: $texteditor-with-label-input-bottom-padding;
}

&.dx-lookup {
.dx-lookup-field {
padding-top: $texteditor-with-label-input-top-padding;
padding-bottom: $texteditor-with-label-input-bottom-padding;
}
}
}

&.dx-texteditor-with-label,
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme/scss/widgets/fluent/tagBox/_sizes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ $fluent-tagbox-tag-container-gap: null !default;
$fluent-tagbox-tag-container-padding-left: 8px !default;
$fluent-tagbox-tag-container-vertical-padding: 3px !default;
$fluent-tagbox-tag-container-gap: 2px !default;
$fluent-tagbox-tag-height: 14px !default;
$fluent-tagbox-tag-content-line-height: 1.2em !default;
$fluent-tagbox-tag-height: 16px !default;
$fluent-tagbox-tag-content-line-height: 1.3333em !default;
$fluent-tagbox-filled-with-label-top-padding: 6px !default;
$fluent-tagbox-filled-with-label-bottom-padding: 0 !default;
}
16 changes: 16 additions & 0 deletions packages/devextreme/scss/widgets/fluent/textArea/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,19 @@
$fluent-filled-texteditor-input-with-label-top-padding,
$fluent-standard-texteditor-with-label-input-top-padding,
);

.dx-textarea {
&.dx-editor-underlined {
.dx-texteditor-input {
padding-top: $fluent-standard-texteditor-input-top-padding + 1;
padding-bottom: $fluent-standard-texteditor-input-bottom-padding + 1;
}

&.dx-texteditor-with-label:not(.dx-texteditor-label-outside),
&.dx-texteditor-with-floating-label {
.dx-texteditor-input {
padding-bottom: $fluent-standard-texteditor-with-label-input-bottom-padding;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ $texteditor-icon-container-size: $fluent-base-icon-size !default;
$fluent-texteditor-label-top-offset: -1px !default;
$fluent-filled-texteditor-input-horizontal-padding: 12px !default;
$fluent-filled-texteditor-input-top-padding: 5px !default;
$fluent-filled-texteditor-input-with-label-top-padding: 10px !default;
$fluent-filled-texteditor-input-with-label-top-padding: 8px !default;
$fluent-filled-texteditor-input-bottom-padding: 5px !default;
$fluent-filled-texteditor-input-with-label-bottom-padding: 3px !default;
$fluent-filled-texteditor-input-with-label-bottom-padding: 2px !default;
$fluent-standard-texteditor-input-top-padding: 5px !default;
$fluent-standard-texteditor-input-bottom-padding: 5px !default;
$fluent-standard-texteditor-with-label-input-top-padding: 9px !default;
$fluent-standard-texteditor-with-label-input-bottom-padding: 4px !default;
$fluent-standard-texteditor-with-label-input-bottom-padding: 3px !default;
$fluent-underlined-editor-button-height: 22px !default;
}

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 05ffbd5

Please sign in to comment.