Skip to content

Commit

Permalink
fluent: align grouped form paddings (#25866)
Browse files Browse the repository at this point in the history
Co-authored-by: Alexander Bulychev <[email protected]>
  • Loading branch information
iBat and Alexander Bulychev authored Oct 24, 2023
1 parent 49d8e80 commit 4b0882b
Show file tree
Hide file tree
Showing 275 changed files with 16 additions and 14 deletions.
6 changes: 0 additions & 6 deletions packages/devextreme/scss/widgets/base/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,6 @@
padding-bottom: 20px;
margin-top: 6px;
}

.dx-form-group {
&.dx-form-group-with-caption {
padding-inline-start: 20px;
}
}
}

.dx-layout-manager-hidden-label {
Expand Down
15 changes: 10 additions & 5 deletions packages/devextreme/scss/widgets/fluent/form/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
.dx-layout-manager {
.dx-field-item {
&:not(.dx-last-col) {
padding-inline-end: $fluent-form-layout-manager-padding;
padding-inline-end: $fluent-form-layout-manager-horizontal-padding;
}

&:not(.dx-first-col) {
padding-inline-start: $fluent-form-layout-manager-padding;
padding-inline-start: $fluent-form-layout-manager-horizontal-padding;
}

&:not(.dx-first-row) {
padding-top: $fluent-form-layout-manager-padding;
padding-top: $fluent-form-layout-manager-vertical-padding;
}

padding-bottom: $fluent-form-layout-manager-padding;
padding-bottom: $fluent-form-layout-manager-vertical-padding;
font-size: $fluent-form-label-font-size;

.dx-field-item {
Expand All @@ -48,12 +48,17 @@
}
}
}

.dx-tabpanel .dx-multiview-item-content {
padding-left: 0;
padding-right: 0;
}
}

.dx-form > .dx-layout-manager.dx-layout-manager-one-col {
.dx-field-item {
.dx-field-item.dx-last-row:not(.dx-last-col) {
padding-bottom: $fluent-form-layout-manager-padding;
padding-bottom: $fluent-form-layout-manager-vertical-padding;
}
}
}
Expand Down
9 changes: 6 additions & 3 deletions packages/devextreme/scss/widgets/fluent/form/_sizes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ $fluent-form-top-label-padding: 0 !default;
$fluent-form-top-label-bottom-margin: null !default;
$fluent-form-default-top-padding: null !default;
$fluent-form-help-text-font-size: 12px !default;
$fluent-form-layout-manager-padding: null !default;
$fluent-form-layout-manager-horizontal-padding: null !default;
$fluent-form-layout-manager-vertical-padding: null !default;

$fluent-form-label-font-size: $fluent-base-font-size !default;
$fluent-form-label-icon-size: $fluent-base-icon-size !default;
Expand All @@ -22,7 +23,8 @@ $fluent-form-label-icon-size: $fluent-base-icon-size !default;
$fluent-form-group-caption-font-size: 20px !default;
$fluent-form-default-top-padding: 16px !default;
$fluent-form-top-label-bottom-margin: 4px !default;
$fluent-form-layout-manager-padding: 8px !default;
$fluent-form-layout-manager-horizontal-padding: 12px !default;
$fluent-form-layout-manager-vertical-padding: 8px !default;
}

@else if $size == "compact" {
Expand All @@ -32,5 +34,6 @@ $fluent-form-label-icon-size: $fluent-base-icon-size !default;
$fluent-form-group-caption-font-size: 16px !default;
$fluent-form-default-top-padding: 8px !default;
$fluent-form-top-label-bottom-margin: 2px !default;
$fluent-form-layout-manager-padding: 6px !default;
$fluent-form-layout-manager-horizontal-padding: 8px !default;
$fluent-form-layout-manager-vertical-padding: 6px !default;
}
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 4b0882b

Please sign in to comment.