Skip to content

Add duotone description #36018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ajlende merged 7 commits into from
Oct 28, 2021
Merged

Add duotone description #36018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f1fff7d
Add duotone description
ajlende Oct 28, 2021
952f022
Use isAlternate for popover content border
ajlende Oct 28, 2021
38f5c29
Combine redundant selectors + properties
ajlende Oct 28, 2021
baee107
Clean up duotone popover content spacing
ajlende Oct 28, 2021
48ebd14
Polish
jasmussen Oct 28, 2021
b9b1394
Add better calculations for duotone swatch layout
ajlende Oct 28, 2021
8d80a81
Fix CSS lint
ajlende Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/block-editor/src/components/duotone-control/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ function DuotoneControl( {
popoverProps={ {
className: 'block-editor-duotone-control__popover',
headerTitle: __( 'Duotone' ),
isAlternate: true,
} }
renderToggle={ ( { isOpen, onToggle } ) => {
const openOnArrowDown = ( event ) => {
Expand All @@ -46,6 +47,11 @@ function DuotoneControl( {
} }
renderContent={ () => (
<MenuGroup label={ __( 'Duotone' ) }>
<div className="block-editor-duotone-control__description">
{ __(
'Create a two-tone color effect without losing your original image.'
) }
</div>
<DuotonePicker
colorPalette={ colorPalette }
duotonePalette={ duotonePalette }
Expand Down
39 changes: 27 additions & 12 deletions packages/block-editor/src/components/duotone-control/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,38 @@
// Must equal $color-palette-circle-size and $color-palette-circle-spacing from:
// @wordpress/components/src/circular-option-picker/style.scss
$swatch-size: 28px;
$swatch-gap: 12px;

$popover-width: $sidebar-width;
$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 {
.components-popover__content {
border: $border-width solid $gray-900;
min-width: 214px;
> .components-popover__content > div {
padding: $popover-padding;
width: $popover-width;
}

.components-circular-option-picker {
padding: $grid-unit-15;
.components-menu-group__label {
padding: 0;
}

.components-menu-group__label {
padding: $grid-unit-15 $grid-unit-15 0 $grid-unit-15;
width: 100%;
box-sizing: border-box;
.components-custom-gradient-picker__gradient-bar {
margin: $grid-unit-20 0 $grid-unit-15;
}

.components-circular-option-picker__swatches {
display: grid;
grid-template-columns: repeat($swatch-columns, $swatch-size);
gap: $swatch-gap;
justify-content: space-between;
}
}

.block-editor-duotone-control__popover > .components-popover__content {
// Matches 8 swatches in width.
width: 334px;
.block-editor-duotone-control__description {
margin: $grid-unit-20 0;
font-size: $helptext-font-size;
}

// Better align the popover under the swatch.
Expand Down