From bbffa48d13e50b2a4334281d44ffd997d80768ef Mon Sep 17 00:00:00 2001 From: yogeshbhutkar Date: Thu, 21 Nov 2024 10:32:16 +0530 Subject: [PATCH 1/4] Dropdown: Reset margin for content wrapper to hide scrollbars --- packages/components/src/dropdown/style.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/components/src/dropdown/style.scss b/packages/components/src/dropdown/style.scss index d7ae7963f7ed8..b019207991a6b 100644 --- a/packages/components/src/dropdown/style.scss +++ b/packages/components/src/dropdown/style.scss @@ -6,6 +6,10 @@ .components-popover__content { padding: $grid-unit-10; + .components-dropdown-content-wrapper { + margin: 0; + } + &:has(.components-menu-group) { padding: 0; From 8aba01a9658fe0d05f10082dd5cab79a57bf1bf2 Mon Sep 17 00:00:00 2001 From: yogeshbhutkar Date: Thu, 21 Nov 2024 10:52:47 +0530 Subject: [PATCH 2/4] FiltersPanel: Add duotone content class to dropdown wrapper and update styles --- .../src/components/global-styles/filters-panel.js | 5 ++++- packages/components/src/dropdown/style.scss | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/block-editor/src/components/global-styles/filters-panel.js b/packages/block-editor/src/components/global-styles/filters-panel.js index 581661e0c8407..3f58ef4a87c14 100644 --- a/packages/block-editor/src/components/global-styles/filters-panel.js +++ b/packages/block-editor/src/components/global-styles/filters-panel.js @@ -202,7 +202,10 @@ export default function FiltersPanel( { ); } } renderContent={ () => ( - +

{ __( diff --git a/packages/components/src/dropdown/style.scss b/packages/components/src/dropdown/style.scss index b019207991a6b..1e447fa0d7098 100644 --- a/packages/components/src/dropdown/style.scss +++ b/packages/components/src/dropdown/style.scss @@ -6,7 +6,7 @@ .components-popover__content { padding: $grid-unit-10; - .components-dropdown-content-wrapper { + .components-dropdown-content-wrapper__duotone-content { margin: 0; } From ddef1757eb785ff5739a38cb34163b8a396a854b Mon Sep 17 00:00:00 2001 From: yogeshbhutkar Date: Tue, 14 Jan 2025 12:04:40 +0530 Subject: [PATCH 3/4] Duotone Control: Adjust padding and clean up styles in dropdown components --- .../block-editor/src/components/duotone-control/style.scss | 4 ++-- .../src/components/global-styles/filters-panel.js | 5 +---- packages/components/src/dropdown/style.scss | 4 ---- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/packages/block-editor/src/components/duotone-control/style.scss b/packages/block-editor/src/components/duotone-control/style.scss index 3a3a5a143289b..ef570844a6660 100644 --- a/packages/block-editor/src/components/duotone-control/style.scss +++ b/packages/block-editor/src/components/duotone-control/style.scss @@ -8,9 +8,9 @@ $popover-padding: $grid-unit-20; $swatch-columns: math.floor(math.div($popover-width + $swatch-gap - 2 * $popover-padding, $swatch-size + $swatch-gap)); -.block-editor-duotone-control__popover { +.block-editor-duotone-control__popover.components-dropdown__content { > .components-popover__content { - padding: $popover-padding; + padding: $grid-unit-10; width: $popover-width; } diff --git a/packages/block-editor/src/components/global-styles/filters-panel.js b/packages/block-editor/src/components/global-styles/filters-panel.js index 64afdb368fa60..64322d0fd5d5c 100644 --- a/packages/block-editor/src/components/global-styles/filters-panel.js +++ b/packages/block-editor/src/components/global-styles/filters-panel.js @@ -201,10 +201,7 @@ export default function FiltersPanel( { ); } } renderContent={ () => ( - +

{ __( diff --git a/packages/components/src/dropdown/style.scss b/packages/components/src/dropdown/style.scss index 1e447fa0d7098..d7ae7963f7ed8 100644 --- a/packages/components/src/dropdown/style.scss +++ b/packages/components/src/dropdown/style.scss @@ -6,10 +6,6 @@ .components-popover__content { padding: $grid-unit-10; - .components-dropdown-content-wrapper__duotone-content { - margin: 0; - } - &:has(.components-menu-group) { padding: 0; From f13734bfeee3e27c4b77110df2a5843821b79c77 Mon Sep 17 00:00:00 2001 From: yogeshbhutkar Date: Tue, 14 Jan 2025 12:13:02 +0530 Subject: [PATCH 4/4] Duotone Control: Update popover padding for improved layout consistency --- .../block-editor/src/components/duotone-control/style.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/block-editor/src/components/duotone-control/style.scss b/packages/block-editor/src/components/duotone-control/style.scss index ef570844a6660..3580833946239 100644 --- a/packages/block-editor/src/components/duotone-control/style.scss +++ b/packages/block-editor/src/components/duotone-control/style.scss @@ -4,13 +4,13 @@ $swatch-size: 28px; $swatch-gap: 12px; $popover-width: 260px; -$popover-padding: $grid-unit-20; +$popover-padding: $grid-unit-10; $swatch-columns: math.floor(math.div($popover-width + $swatch-gap - 2 * $popover-padding, $swatch-size + $swatch-gap)); -.block-editor-duotone-control__popover.components-dropdown__content { +.block-editor-duotone-control__popover.components-popover { > .components-popover__content { - padding: $grid-unit-10; + padding: $popover-padding; width: $popover-width; }