Skip to content
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

Jump to bottom

Background image: move controls into a popover #60151

Merged
merged 11 commits into from
Jul 3, 2024
Merged

Background image: move controls into a popover #60151

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ca6be90
Testing other component layout and dummy toolspanel items
ramonjd Mar 28, 2024
055878a
Rejigging components, catering for no-background-image-controls
ramonjd Jun 19, 2024
c1f4648
With tabs
ramonjd Jun 20, 2024
6640acb
Revert tabs and move the image upload to the floating panel
ramonjd Jun 25, 2024
ca9f7b8
Temp hack to push popover into the background
ramonjd Jun 25, 2024
37dd1e2
Fix hack to push popover into the background
ramonjd Jun 25, 2024
808fb80
Tweak size of media flow dropdown
ramonjd Jun 27, 2024
bf0aab0
Remove default controls override as there's only 'background image' now.
ramonjd Jun 28, 2024
6836456
Rolling back expanding popover in mobile.
ramonjd Jul 2, 2024
d0a56df
Remove commented-out code
ramonjd Jul 2, 2024
34d20ce
Revert input sizes
ramonjd Jul 3, 2024
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
Prev Previous commit
Revert input sizes 
Ensure long file names are not cut off by min-width
Use clamp value for focal picker image height
  • Loading branch information
@ramonjd
ramonjd committed Jul 3, 2024
commit 34d20ce2ddb44385f2633b4d1df4934c9b5ab194
3 changes: 3 additions & 0 deletions packages/block-editor/src/components/global-styles/background-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,13 +545,15 @@ function BackgroundSizeControls( {
return (
<VStack spacing={ 3 } className="single-column">
<FocalPointPicker
__next40pxDefaultSize
__nextHasNoMarginBottom
label={ __( 'Position' ) }
url={ getResolvedThemeFilePath( imageValue, themeFileURIs ) }
value={ backgroundPositionToCoords( positionValue ) }
onChange={ updateBackgroundPosition }
/>
<ToggleGroupControl
size="__unstable-large"
label={ __( 'Size' ) }
value={ currentValueForToggle }
onChange={ updateBackgroundSize }
Expand Down Expand Up @@ -590,6 +592,7 @@ function BackgroundSizeControls( {
aria-label={ __( 'Background image width' ) }
onChange={ updateBackgroundSize }
value={ sizeValue }
size="__unstable-large"
__unstableInputWidth="100px"
min={ 0 }
placeholder={ __( 'Auto' ) }
Expand Down
11 changes: 7 additions & 4 deletions packages/block-editor/src/components/global-styles/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,12 @@
text-align-last: center;
}

.block-editor-global-styles-background-panel__inspector-image-indicator-wrapper {
width: 20px;
height: 20px;
.block-editor-global-styles-background-panel__inspector-preview-inner {
.block-editor-global-styles-background-panel__inspector-image-indicator-wrapper {
width: 20px;
height: 20px;
min-width: auto;
}
}

.block-editor-global-styles-background-panel__inspector-image-indicator {
Expand Down Expand Up @@ -190,7 +193,7 @@
margin-bottom: 0;
}
.components-focal-point-picker__media--image {
max-height: 100px;
max-height: clamp(120px, 9vh, 280px);
}
}

Expand Down
Loading