Skip to content

Commit

Permalink
fix underlined mode
Browse files Browse the repository at this point in the history
  • Loading branch information
EugeniyKiyashko committed Sep 1, 2023
1 parent 1011cfa commit 694676e
Show file tree
Hide file tree
Showing 141 changed files with 35 additions and 41 deletions.
2 changes: 1 addition & 1 deletion packages/devextreme/scss/widgets/base/_tagBox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

.dx-tag {
max-width: calc(100% - 1px);
display: inline-block;
display: inline-flex;
align-self: flex-start;
}

Expand Down
5 changes: 5 additions & 0 deletions packages/devextreme/scss/widgets/base/textEditor/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@

.dx-texteditor {
display: block;

&.dx-texteditor-with-label,
&.dx-texteditor-with-floating-label {
position: relative;
}
}

/* B231111 */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,10 @@
&.dx-texteditor-with-label,
&.dx-texteditor-with-floating-label {
outline: none;
position: relative;
margin-top: $label-offset-y;

&.dx-daterangebox {
.dx-label {
position: relative;

.dx-label {
&::before {
content: '';
width: 100%;
Expand Down Expand Up @@ -352,8 +349,6 @@

&.dx-texteditor-with-label,
&.dx-texteditor-with-floating-label {
position: relative;

.dx-texteditor-input,
.dx-placeholder::before,
.dx-lookup-field {
Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme/scss/widgets/fluent/_sizes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ $fluent-button-icon-margin: null !default;
$fluent-base-font-size: 14px !default;

// Base sizes
$fluent-base-inline-widget-height: 48px !default;
$fluent-base-inline-block-height: 19px !default;
$fluent-base-icon-size: 24px !default;
$fluent-base-inline-widget-height: 32px !default; // 48px !default;
$fluent-base-inline-block-height: 19px !default; // 19px !default;
$fluent-base-icon-size: 20px !default; // 24px !default
$fluent-base-inline-horizontal-padding: 10px !default;
$fluent-base-border-radius: 4px !default;
$fluent-base-dropdown-widgets-shadow: 0 2px 7px $base-dropdown-shadow-color !default;
Expand Down
27 changes: 12 additions & 15 deletions packages/devextreme/scss/widgets/fluent/tagBox/_sizes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ $fluent-tagbox-tag-content-font-size: null !default;
$fluent-tagbox-tag-container-padding: null !default;
$fluent-tagbox-tag-container-padding-left: null !default;
$fluent-tagbox-tag-container-vertical-padding: null !default;
$fluent-tagbox-filled-tag-container-padding: null !default;
$fluent-tagbox-tag-height: null !default;


Expand All @@ -24,19 +23,18 @@ $fluent-tagbox-filled-with-label-top-padding: null !default;
$fluent-tagbox-filled-with-label-bottom-padding: null !default;

@if $size == "default" {
$fluent-tagbox-tag-content-padding-left: 8px !default;
$fluent-tagbox-tag-content-padding-right: 30px !default;
$fluent-tagbox-tag-content-vertical-padding: 4px !default;
$fluent-tagbox-tag-content-font-size: 14px !default;
$fluent-tagbox-tag-container-padding: 0 12px 11px 16px !default;
$fluent-tagbox-tag-container-padding-left: 16px !default;
$fluent-tagbox-tag-container-vertical-padding: 11px !default;
$fluent-tagbox-filled-tag-container-padding: 0 12px 4px 16px !default;
$fluent-tagbox-tag-height: 26px !default;
$fluent-tagbox-remove-button-width: 26px !default;
$fluent-tagbox-remove-button-icon-size: 16px !default;
$fluent-tagbox-filled-with-label-top-padding: 18px !default;
$fluent-tagbox-filled-with-label-bottom-padding: 4px !default;
$fluent-tagbox-tag-content-padding-left: 6px !default; // 8px !default;
$fluent-tagbox-tag-content-padding-right: 20px !default; // 30px !default;
$fluent-tagbox-tag-content-vertical-padding: 2px !default; // 4px !default;
$fluent-tagbox-tag-content-font-size: 12px !default; // 14px !default;
$fluent-tagbox-tag-container-padding: 0 12px 3px 16px !default; // 0 12px 11px 16px !default;
$fluent-tagbox-tag-container-padding-left: 12px !default; // 16px !default;
$fluent-tagbox-tag-container-vertical-padding: 7px !default; // 11px !default;
$fluent-tagbox-tag-height: 18px !default; // 26px !default;
$fluent-tagbox-remove-button-width: 18px !default; // 26px !default;
$fluent-tagbox-remove-button-icon-size: 12px !default; // 16px !default;
$fluent-tagbox-filled-with-label-top-padding: 10px !default; // 18px !default;
$fluent-tagbox-filled-with-label-bottom-padding: 4px !default; // 4px !default;
}

@else if $size == "compact" {
Expand All @@ -47,7 +45,6 @@ $fluent-tagbox-filled-with-label-bottom-padding: null !default;
$fluent-tagbox-tag-container-padding: 0 8px 3px 11px !default;
$fluent-tagbox-tag-container-padding-left: 12px !default;
$fluent-tagbox-tag-container-vertical-padding: 7px !default;
$fluent-tagbox-filled-tag-container-padding: 0 12px 18px 16px !default;
$fluent-tagbox-tag-height: 18px !default;
$fluent-tagbox-remove-button-width: 18px !default;
$fluent-tagbox-remove-button-icon-size: 12px !default;
Expand Down
26 changes: 13 additions & 13 deletions packages/devextreme/scss/widgets/fluent/textEditor/_sizes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ $fluent-filled-texteditor-input-with-label-bottom-padding: null !default;

@if $size == "default" {
$fluent-texteditor-font-size: 16px !default;
$fluent-texteditor-label-font-size: 12px !default;
$fluent-texteditor-clear-icon-size: 12px !default;
$fluent-texteditor-label-top-offset: 4px !default;
$fluent-filled-texteditor-input-horizontal-padding: 16px !default;
$fluent-filled-texteditor-input-top-padding: 15px !default;
$fluent-filled-texteditor-input-with-label-top-padding: 21px;
$fluent-filled-texteditor-input-bottom-padding: 14px !default;
$fluent-filled-texteditor-input-with-label-bottom-padding: 8px;
$fluent-standard-texteditor-input-top-padding: 15px !default;
$fluent-standard-texteditor-input-bottom-padding: 14px !default;
$fluent-standard-texteditor-with-label-input-top-padding: 21px !default;
$fluent-standard-texteditor-with-label-input-bottom-padding: 8px !default;
$fluent-underlined-editor-button-height: 28px !default;
$fluent-texteditor-label-font-size: 12px !default; // 12px !default;
$fluent-texteditor-clear-icon-size: 12px !default; // 12px !default;
$fluent-texteditor-label-top-offset: 0 !default; // 4px !default;
$fluent-filled-texteditor-input-horizontal-padding: 16px !default; // 16px !default;
$fluent-filled-texteditor-input-top-padding: 7px; // 15px !default;
$fluent-filled-texteditor-input-with-label-top-padding: 10px !default; // 21px;
$fluent-filled-texteditor-input-bottom-padding: 6px; // 14px !default;
$fluent-filled-texteditor-input-with-label-bottom-padding: 3px; // 8px;
$fluent-standard-texteditor-input-top-padding: 7px !default; // 15px !default;
$fluent-standard-texteditor-input-bottom-padding: 6px !default; // 14px !default;
$fluent-standard-texteditor-with-label-input-top-padding: 9px !default; // 21px !default;
$fluent-standard-texteditor-with-label-input-bottom-padding: 4px !default; // 8px !default;
$fluent-underlined-editor-button-height: 22px !default; // 28px !default;
}

@else if $size == "compact" {
Expand Down
3 changes: 0 additions & 3 deletions packages/devextreme/scss/widgets/material/tagBox/_sizes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ $material-tagbox-tag-content-font-size: null !default;
$material-tagbox-tag-container-padding: null !default;
$material-tagbox-tag-container-padding-left: null !default;
$material-tagbox-tag-container-vertical-padding: null !default;
$material-tagbox-filled-tag-container-padding: null !default;
$material-tagbox-tag-height: null !default;


Expand All @@ -31,7 +30,6 @@ $material-tagbox-filled-with-label-bottom-padding: null !default;
$material-tagbox-tag-container-padding: 0 12px 11px 16px !default;
$material-tagbox-tag-container-padding-left: 16px !default;
$material-tagbox-tag-container-vertical-padding: 11px !default;
$material-tagbox-filled-tag-container-padding: 0 12px 4px 16px !default;
$material-tagbox-tag-height: 26px !default;
$material-tagbox-remove-button-width: 26px !default;
$material-tagbox-remove-button-icon-size: 16px !default;
Expand All @@ -47,7 +45,6 @@ $material-tagbox-filled-with-label-bottom-padding: null !default;
$material-tagbox-tag-container-padding: 0 8px 3px 11px !default;
$material-tagbox-tag-container-padding-left: 12px !default;
$material-tagbox-tag-container-vertical-padding: 7px !default;
$material-tagbox-filled-tag-container-padding: 0 12px 18px 16px !default;
$material-tagbox-tag-height: 18px !default;
$material-tagbox-remove-button-width: 18px !default;
$material-tagbox-remove-button-icon-size: 12px !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.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.

0 comments on commit 694676e

Please sign in to comment.