From 81a51d6df22db9fdfec646b1c3a44f16807d7611 Mon Sep 17 00:00:00 2001 From: Alexander Kozlovskiy Date: Tue, 21 Jan 2025 19:17:47 +0400 Subject: [PATCH 01/11] TagBox - selectAll checkBox should be aligned correctly in fluent (T1252002) --- .../devextreme-scss/scss/widgets/fluent/common/_mixins.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss b/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss index 520129dc8a2e..34d753954e0f 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss @@ -92,7 +92,8 @@ $badge-invalid-bg: $base-invalid-color; padding: $fluent-list-item-vertical-padding + 2px 0 $fluent-list-item-vertical-padding - 2px; } - .dx-list-items { + .dx-list-items, + .dx-list-select-all { margin-left: $fluent-list-vertical-padding; margin-right: $fluent-list-vertical-padding; } From b86394205ec86a16b2ba5f850f73c70f581ea160 Mon Sep 17 00:00:00 2001 From: Alexander Kozlovskiy Date: Tue, 21 Jan 2025 20:41:14 +0400 Subject: [PATCH 02/11] add test --- .../tests/editors/tagBox/common.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/e2e/testcafe-devextreme/tests/editors/tagBox/common.ts b/e2e/testcafe-devextreme/tests/editors/tagBox/common.ts index 45be97f3450f..b34abff1c237 100644 --- a/e2e/testcafe-devextreme/tests/editors/tagBox/common.ts +++ b/e2e/testcafe-devextreme/tests/editors/tagBox/common.ts @@ -3,6 +3,7 @@ import TagBox from 'devextreme-testcafe-models/tagBox'; import { testScreenshot } from '../../../helpers/themeUtils'; import url from '../../../helpers/getPageUrl'; import { createWidget } from '../../../helpers/createWidget'; +import { safeSizeTest } from '../../../helpers/safeSizeTest'; fixture.disablePageReloads`TagBox` .page(url(__dirname, '../../container.html')); @@ -123,6 +124,23 @@ test('Select all checkbox should be focused by tab and closed by escape (T389453 applyValueMode: 'useButtons', })); +safeSizeTest('TagBox with selection controls', async (t) => { + const { takeScreenshot, compareResults } = createScreenshotsComparer(t); + const tagBox = new TagBox('#container'); + + await t.click(tagBox.element); + + await testScreenshot(t, takeScreenshot, 'TagBox with selection controls'); + + await t + .expect(compareResults.isValid()) + .ok(compareResults.errorMessages()); +}, [300, 400]).before(async () => createWidget('dxTagBox', { + items: [1, 2, 3, 4, 5, 6, 7], + showSelectionControls: true, + width: 300, +})); + test('Placeholder is visible after items option change when value is not chosen (T1099804)', async (t) => { const { takeScreenshot, compareResults } = createScreenshotsComparer(t); const tagBox = new TagBox('#container'); From 1b4a78c45614966693e4bda0888099833f1f0753 Mon Sep 17 00:00:00 2001 From: Alexander Kozlovskiy Date: Tue, 21 Jan 2025 22:16:21 +0400 Subject: [PATCH 03/11] Update common.ts --- e2e/testcafe-devextreme/tests/editors/tagBox/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/testcafe-devextreme/tests/editors/tagBox/common.ts b/e2e/testcafe-devextreme/tests/editors/tagBox/common.ts index b34abff1c237..d46f77dc17f0 100644 --- a/e2e/testcafe-devextreme/tests/editors/tagBox/common.ts +++ b/e2e/testcafe-devextreme/tests/editors/tagBox/common.ts @@ -130,7 +130,7 @@ safeSizeTest('TagBox with selection controls', async (t) => { await t.click(tagBox.element); - await testScreenshot(t, takeScreenshot, 'TagBox with selection controls'); + await testScreenshot(t, takeScreenshot, 'TagBox with selection controls.png'); await t .expect(compareResults.isValid()) From 147c7fdbe99aafee5c635011c3381136dbb96238 Mon Sep 17 00:00:00 2001 From: Alexander Kozlovskiy Date: Wed, 22 Jan 2025 00:26:33 +0400 Subject: [PATCH 04/11] rework styles --- .../tests/editors/tagBox/common.ts | 2 +- .../scss/widgets/fluent/common/_mixins.scss | 13 +++++++++---- .../scss/widgets/fluent/dropDownEditor/_index.scss | 3 ++- .../scss/widgets/fluent/dropDownList/_sizes.scss | 1 + .../scss/widgets/fluent/list/_sizes.scss | 1 + 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/e2e/testcafe-devextreme/tests/editors/tagBox/common.ts b/e2e/testcafe-devextreme/tests/editors/tagBox/common.ts index d46f77dc17f0..b90bdde91182 100644 --- a/e2e/testcafe-devextreme/tests/editors/tagBox/common.ts +++ b/e2e/testcafe-devextreme/tests/editors/tagBox/common.ts @@ -135,7 +135,7 @@ safeSizeTest('TagBox with selection controls', async (t) => { await t .expect(compareResults.isValid()) .ok(compareResults.errorMessages()); -}, [300, 400]).before(async () => createWidget('dxTagBox', { +}, [300, 300]).before(async () => createWidget('dxTagBox', { items: [1, 2, 3, 4, 5, 6, 7], showSelectionControls: true, width: 300, diff --git a/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss b/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss index 34d753954e0f..40f2730897be 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss @@ -6,6 +6,7 @@ @use "../../base/mixins" as *; @use "../../base/validation" as *; @use "../list/sizes" as *; +@use "../dropdownlist/sizes" as *; $badge-invalid-bg: $base-invalid-color; @@ -89,13 +90,17 @@ $badge-invalid-bg: $base-invalid-color; } .dx-list-select-all { + margin-inline: $fluent-list-horizontal-padding; padding: $fluent-list-item-vertical-padding + 2px 0 $fluent-list-item-vertical-padding - 2px; } - .dx-list-items, - .dx-list-select-all { - margin-left: $fluent-list-vertical-padding; - margin-right: $fluent-list-vertical-padding; + .dx-list-items { + margin-left: $fluent-list-horizontal-padding; + margin-right: $fluent-list-horizontal-padding; + + .dx-list-select-checkbox { + margin-inline: $fluent-dropdownlist-checkbox-margin; + } } .dx-list-item, diff --git a/packages/devextreme-scss/scss/widgets/fluent/dropDownEditor/_index.scss b/packages/devextreme-scss/scss/widgets/fluent/dropDownEditor/_index.scss index 3ea7ada4cf6d..524f7550ac16 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/dropDownEditor/_index.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/dropDownEditor/_index.scss @@ -128,7 +128,8 @@ $fluent-dropdowneditor-invalid-badge-size: $fluent-invalid-badge-size + $fluent- } .dx-list-group-header, - .dx-list-item-content { + .dx-list-item-content, + .dx-list-select-all-label { font-size: $fluent-dropdowneditor-list-font-size; line-height: $fluent-dropdowneditor-list-line-height; } diff --git a/packages/devextreme-scss/scss/widgets/fluent/dropDownList/_sizes.scss b/packages/devextreme-scss/scss/widgets/fluent/dropDownList/_sizes.scss index 43b104010f9e..9ffce760ec26 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/dropDownList/_sizes.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/dropDownList/_sizes.scss @@ -2,3 +2,4 @@ // adduse +$fluent-dropdownlist-checkbox-margin: 8px !default; diff --git a/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss b/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss index 5cc5743c44a7..dcea42a1eba2 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss @@ -3,6 +3,7 @@ // adduse $fluent-list-vertical-padding: 4px !default; +$fluent-list-horizontal-padding: 4px !default; $fluent-list-bottom-padding: 4px !default; $fluent-list-searchbox-margin-bottom: 4px !default; $fluent-list-item-height: null !default; From c6b6b24bb3af4be8beb833588479bf2e71fe3747 Mon Sep 17 00:00:00 2001 From: Alexander Kozlovskiy Date: Wed, 22 Jan 2025 00:57:55 +0400 Subject: [PATCH 05/11] rework styles --- .../devextreme-scss/scss/widgets/fluent/common/_mixins.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss b/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss index 40f2730897be..91047f91aade 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss @@ -6,7 +6,7 @@ @use "../../base/mixins" as *; @use "../../base/validation" as *; @use "../list/sizes" as *; -@use "../dropdownlist/sizes" as *; +@use "../dropDownList/sizes" as *; $badge-invalid-bg: $base-invalid-color; @@ -95,8 +95,7 @@ $badge-invalid-bg: $base-invalid-color; } .dx-list-items { - margin-left: $fluent-list-horizontal-padding; - margin-right: $fluent-list-horizontal-padding; + margin-inline: $fluent-list-horizontal-padding; .dx-list-select-checkbox { margin-inline: $fluent-dropdownlist-checkbox-margin; From 5ab8cb946dfc263dbd9630146a9887a260ec43cb Mon Sep 17 00:00:00 2001 From: Alexander Kozlovskiy Date: Wed, 22 Jan 2025 01:02:56 +0400 Subject: [PATCH 06/11] rework styles --- .../devextreme-scss/scss/widgets/fluent/common/_mixins.scss | 3 +-- .../scss/widgets/fluent/dropDownList/_sizes.scss | 1 - packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss b/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss index 91047f91aade..2f4b9a501084 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss @@ -6,7 +6,6 @@ @use "../../base/mixins" as *; @use "../../base/validation" as *; @use "../list/sizes" as *; -@use "../dropDownList/sizes" as *; $badge-invalid-bg: $base-invalid-color; @@ -98,7 +97,7 @@ $badge-invalid-bg: $base-invalid-color; margin-inline: $fluent-list-horizontal-padding; .dx-list-select-checkbox { - margin-inline: $fluent-dropdownlist-checkbox-margin; + margin-inline: $fluent-list-item-checkbox-horizontal-margin; } } diff --git a/packages/devextreme-scss/scss/widgets/fluent/dropDownList/_sizes.scss b/packages/devextreme-scss/scss/widgets/fluent/dropDownList/_sizes.scss index 9ffce760ec26..43b104010f9e 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/dropDownList/_sizes.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/dropDownList/_sizes.scss @@ -2,4 +2,3 @@ // adduse -$fluent-dropdownlist-checkbox-margin: 8px !default; diff --git a/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss b/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss index dcea42a1eba2..6323d070c7fa 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss @@ -4,6 +4,7 @@ $fluent-list-vertical-padding: 4px !default; $fluent-list-horizontal-padding: 4px !default; +$fluent-list-item-checkbox-horizontal-margin: 8px !default; $fluent-list-bottom-padding: 4px !default; $fluent-list-searchbox-margin-bottom: 4px !default; $fluent-list-item-height: null !default; From 9bdd953cb745e8c5c3618bce95d20d657143de20 Mon Sep 17 00:00:00 2001 From: Alexander Kozlovskiy Date: Wed, 22 Jan 2025 01:30:02 +0400 Subject: [PATCH 07/11] add etanol --- ...th selection controls (fluent-blue-light).png | Bin 0 -> 5889 bytes ...x with selection controls (generic-light).png | Bin 0 -> 5539 bytes ... selection controls (material-blue-light).png | Bin 0 -> 4933 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 e2e/testcafe-devextreme/tests/editors/tagBox/etalons/TagBox with selection controls (fluent-blue-light).png create mode 100644 e2e/testcafe-devextreme/tests/editors/tagBox/etalons/TagBox with selection controls (generic-light).png create mode 100644 e2e/testcafe-devextreme/tests/editors/tagBox/etalons/TagBox with selection controls (material-blue-light).png diff --git a/e2e/testcafe-devextreme/tests/editors/tagBox/etalons/TagBox with selection controls (fluent-blue-light).png b/e2e/testcafe-devextreme/tests/editors/tagBox/etalons/TagBox with selection controls (fluent-blue-light).png new file mode 100644 index 0000000000000000000000000000000000000000..16a1211739cd715956e2f81b099414549fc82211 GIT binary patch literal 5889 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 literal 0 HcmV?d00001 diff --git a/e2e/testcafe-devextreme/tests/editors/tagBox/etalons/TagBox with selection controls (generic-light).png b/e2e/testcafe-devextreme/tests/editors/tagBox/etalons/TagBox with selection controls (generic-light).png new file mode 100644 index 0000000000000000000000000000000000000000..86c695f417aaadb9f435c75346b1d820b82cffe5 GIT binary patch literal 5539 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 Y$Va%mXx<9mi!CwKGr>MObo%PQ06*;-1poj5 literal 0 HcmV?d00001 From da51a9aa161a1a7b434d529f4a7b1a2b3ee1b201 Mon Sep 17 00:00:00 2001 From: Alexander Kozlovskiy Date: Wed, 22 Jan 2025 01:45:12 +0400 Subject: [PATCH 08/11] apply suggestions --- e2e/testcafe-devextreme/tests/editors/tagBox/common.ts | 4 +++- packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/e2e/testcafe-devextreme/tests/editors/tagBox/common.ts b/e2e/testcafe-devextreme/tests/editors/tagBox/common.ts index b90bdde91182..c9927ce676d9 100644 --- a/e2e/testcafe-devextreme/tests/editors/tagBox/common.ts +++ b/e2e/testcafe-devextreme/tests/editors/tagBox/common.ts @@ -130,7 +130,9 @@ safeSizeTest('TagBox with selection controls', async (t) => { await t.click(tagBox.element); - await testScreenshot(t, takeScreenshot, 'TagBox with selection controls.png'); + await testScreenshot(t, takeScreenshot, 'TagBox with selection controls.png', { + shouldTestInCompact: true, + }); await t .expect(compareResults.isValid()) diff --git a/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss b/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss index 6323d070c7fa..b8abab06aabb 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss @@ -4,7 +4,7 @@ $fluent-list-vertical-padding: 4px !default; $fluent-list-horizontal-padding: 4px !default; -$fluent-list-item-checkbox-horizontal-margin: 8px !default; +$fluent-list-item-checkbox-horizontal-margin: null !default; $fluent-list-bottom-padding: 4px !default; $fluent-list-searchbox-margin-bottom: 4px !default; $fluent-list-item-height: null !default; @@ -15,6 +15,7 @@ $fluent-list-group-header-vertical-padding: null !default; $fluent-list-next-button-horizontal-padding: null !default; @if $size == "default" { + $fluent-list-item-checkbox-horizontal-margin: 8px !default; $fluent-list-item-height: 32px !default; $fluent-list-item-vertical-padding: 6px !default; $fluent-list-item-horizontal-padding: 12px !default; @@ -23,6 +24,7 @@ $fluent-list-next-button-horizontal-padding: null !default; } @else if $size == "compact" { + $fluent-list-item-checkbox-horizontal-margin: 4px !default; $fluent-list-item-height: 24px !default; $fluent-list-item-vertical-padding: 4px !default; $fluent-list-item-horizontal-padding: 8px !default; From 91dc0f1b396e766d303760f375f2446be09dc4d9 Mon Sep 17 00:00:00 2001 From: Alexander Kozlovskiy Date: Wed, 22 Jan 2025 02:25:55 +0400 Subject: [PATCH 09/11] add compact etanol --- ...tion controls (fluent-blue-light-compact).png | Bin 0 -> 5427 bytes ...election controls (generic-light-compact).png | Bin 0 -> 5519 bytes ...on controls (material-blue-light-compact).png | Bin 0 -> 4206 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 e2e/testcafe-devextreme/tests/editors/tagBox/etalons/TagBox with selection controls (fluent-blue-light-compact).png create mode 100644 e2e/testcafe-devextreme/tests/editors/tagBox/etalons/TagBox with selection controls (generic-light-compact).png create mode 100644 e2e/testcafe-devextreme/tests/editors/tagBox/etalons/TagBox with selection controls (material-blue-light-compact).png diff --git a/e2e/testcafe-devextreme/tests/editors/tagBox/etalons/TagBox with selection controls (fluent-blue-light-compact).png b/e2e/testcafe-devextreme/tests/editors/tagBox/etalons/TagBox with selection controls (fluent-blue-light-compact).png new file mode 100644 index 0000000000000000000000000000000000000000..cac9ecaa2de3169335b85a76803424e9f1d54f76 GIT binary patch literal 5427 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 literal 0 HcmV?d00001 diff --git a/e2e/testcafe-devextreme/tests/editors/tagBox/etalons/TagBox with selection controls (generic-light-compact).png b/e2e/testcafe-devextreme/tests/editors/tagBox/etalons/TagBox with selection controls (generic-light-compact).png new file mode 100644 index 0000000000000000000000000000000000000000..0b8d68e826f885a757b6a8234139a04a317bf06f GIT binary patch literal 5519 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 TR17>}T}L#sAe0!M{PjNop5X4P literal 0 HcmV?d00001 diff --git a/e2e/testcafe-devextreme/tests/editors/tagBox/etalons/TagBox with selection controls (material-blue-light-compact).png b/e2e/testcafe-devextreme/tests/editors/tagBox/etalons/TagBox with selection controls (material-blue-light-compact).png new file mode 100644 index 0000000000000000000000000000000000000000..4d4a3acbf1dd254a361903340bb22f3a2fc5d798 GIT binary patch literal 4206 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 Date: Wed, 22 Jan 2025 02:32:26 +0400 Subject: [PATCH 10/11] rename variables --- .../scss/widgets/fluent/common/_mixins.scss | 6 +++--- .../devextreme-scss/scss/widgets/fluent/list/_sizes.scss | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss b/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss index 2f4b9a501084..fcaebfa24b90 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss @@ -89,15 +89,15 @@ $badge-invalid-bg: $base-invalid-color; } .dx-list-select-all { - margin-inline: $fluent-list-horizontal-padding; + margin-inline: $fluent-list-item-inline-margin; padding: $fluent-list-item-vertical-padding + 2px 0 $fluent-list-item-vertical-padding - 2px; } .dx-list-items { - margin-inline: $fluent-list-horizontal-padding; + margin-inline: $fluent-list-item-inline-margin; .dx-list-select-checkbox { - margin-inline: $fluent-list-item-checkbox-horizontal-margin; + margin-inline: $fluent-list-item-checkbox-inline-margin; } } diff --git a/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss b/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss index b8abab06aabb..b139621af628 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss @@ -3,8 +3,8 @@ // adduse $fluent-list-vertical-padding: 4px !default; -$fluent-list-horizontal-padding: 4px !default; -$fluent-list-item-checkbox-horizontal-margin: null !default; +$fluent-list-item-inline-margin: 4px !default; +$fluent-list-item-checkbox-inline-margin: null !default; $fluent-list-bottom-padding: 4px !default; $fluent-list-searchbox-margin-bottom: 4px !default; $fluent-list-item-height: null !default; @@ -15,7 +15,7 @@ $fluent-list-group-header-vertical-padding: null !default; $fluent-list-next-button-horizontal-padding: null !default; @if $size == "default" { - $fluent-list-item-checkbox-horizontal-margin: 8px !default; + $fluent-list-item-checkbox-inline-margin: 8px !default; $fluent-list-item-height: 32px !default; $fluent-list-item-vertical-padding: 6px !default; $fluent-list-item-horizontal-padding: 12px !default; @@ -24,7 +24,7 @@ $fluent-list-next-button-horizontal-padding: null !default; } @else if $size == "compact" { - $fluent-list-item-checkbox-horizontal-margin: 4px !default; + $fluent-list-item-checkbox-inline-margin: 4px !default; $fluent-list-item-height: 24px !default; $fluent-list-item-vertical-padding: 4px !default; $fluent-list-item-horizontal-padding: 8px !default; From 13deb6e860c9ba508377fa840844df23c0649b85 Mon Sep 17 00:00:00 2001 From: Alexander Kozlovskiy Date: Wed, 22 Jan 2025 02:35:41 +0400 Subject: [PATCH 11/11] rename variables one more time --- .../scss/widgets/fluent/common/_mixins.scss | 6 +++--- .../devextreme-scss/scss/widgets/fluent/list/_sizes.scss | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss b/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss index fcaebfa24b90..814c69a83acc 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/common/_mixins.scss @@ -89,15 +89,15 @@ $badge-invalid-bg: $base-invalid-color; } .dx-list-select-all { - margin-inline: $fluent-list-item-inline-margin; + margin-inline: $fluent-list-item-margin-inline; padding: $fluent-list-item-vertical-padding + 2px 0 $fluent-list-item-vertical-padding - 2px; } .dx-list-items { - margin-inline: $fluent-list-item-inline-margin; + margin-inline: $fluent-list-item-margin-inline; .dx-list-select-checkbox { - margin-inline: $fluent-list-item-checkbox-inline-margin; + margin-inline: $fluent-list-item-checkbox-margin-inline; } } diff --git a/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss b/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss index b139621af628..7f8d6a8a88c4 100644 --- a/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss +++ b/packages/devextreme-scss/scss/widgets/fluent/list/_sizes.scss @@ -3,8 +3,8 @@ // adduse $fluent-list-vertical-padding: 4px !default; -$fluent-list-item-inline-margin: 4px !default; -$fluent-list-item-checkbox-inline-margin: null !default; +$fluent-list-item-margin-inline: 4px !default; +$fluent-list-item-checkbox-margin-inline: null !default; $fluent-list-bottom-padding: 4px !default; $fluent-list-searchbox-margin-bottom: 4px !default; $fluent-list-item-height: null !default; @@ -15,7 +15,7 @@ $fluent-list-group-header-vertical-padding: null !default; $fluent-list-next-button-horizontal-padding: null !default; @if $size == "default" { - $fluent-list-item-checkbox-inline-margin: 8px !default; + $fluent-list-item-checkbox-margin-inline: 8px !default; $fluent-list-item-height: 32px !default; $fluent-list-item-vertical-padding: 6px !default; $fluent-list-item-horizontal-padding: 12px !default; @@ -24,7 +24,7 @@ $fluent-list-next-button-horizontal-padding: null !default; } @else if $size == "compact" { - $fluent-list-item-checkbox-inline-margin: 4px !default; + $fluent-list-item-checkbox-margin-inline: 4px !default; $fluent-list-item-height: 24px !default; $fluent-list-item-vertical-padding: 4px !default; $fluent-list-item-horizontal-padding: 8px !default;