Skip to content

Commit

Permalink
Add __nextHasNoMarginBottom to BaseControl-based components (#729)
Browse files Browse the repository at this point in the history
  • Loading branch information
@t-hamano
t-hamano authored Sep 23, 2024
1 parent 6824dc0 commit ffa9186
Show file tree
Hide file tree
Showing 6 changed files with 106 additions and 72 deletions.
132 changes: 71 additions & 61 deletions src/editor-sidebar/create-panel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ export const CreateThemePanel = ( { createType } ) => {
/>
<VStack>
<TextControl
__nextHasNoMarginBottom
label={ __( 'Theme name', 'create-block-theme' ) }
value={ theme.name }
onChange={ ( value ) =>
Expand All @@ -153,67 +154,76 @@ export const CreateThemePanel = ( { createType } ) => {
) }
</summary>
<Spacer />
<TextareaControl
label={ __(
'Theme description',
'create-block-theme'
) }
value={ theme.description }
onChange={ ( value ) =>
setTheme( { ...theme, description: value } )
}
placeholder={ __(
'A short description of the theme',
'create-block-theme'
) }
/>
<TextControl
label={ __( 'Theme URI', 'create-block-theme' ) }
value={ theme.uri }
onChange={ ( value ) =>
setTheme( { ...theme, uri: value } )
}
placeholder={ __(
'https://github.com/wordpress/twentytwentythree/',
'create-block-theme'
) }
/>
<TextControl
label={ __( 'Author', 'create-block-theme' ) }
value={ theme.author }
onChange={ ( value ) =>
setTheme( { ...theme, author: value } )
}
placeholder={ __(
'the WordPress team',
'create-block-theme'
) }
/>
<TextControl
label={ __( 'Author URI', 'create-block-theme' ) }
value={ theme.author_uri }
onChange={ ( value ) =>
setTheme( { ...theme, author_uri: value } )
}
placeholder={ __(
'https://wordpress.org/',
'create-block-theme'
) }
/>
<SelectControl
label={ __(
'Minimum WordPress version',
'create-block-theme'
) }
value={ theme.requires_wp }
options={ WP_MINIMUM_VERSIONS.map( ( version ) => ( {
label: version,
value: version,
} ) ) }
onChange={ ( value ) => {
setTheme( { ...theme, requires_wp: value } );
} }
/>
<VStack spacing={ 4 }>
<TextareaControl
__nextHasNoMarginBottom
label={ __(
'Theme description',
'create-block-theme'
) }
value={ theme.description }
onChange={ ( value ) =>
setTheme( { ...theme, description: value } )
}
placeholder={ __(
'A short description of the theme',
'create-block-theme'
) }
/>
<TextControl
__nextHasNoMarginBottom
label={ __( 'Theme URI', 'create-block-theme' ) }
value={ theme.uri }
onChange={ ( value ) =>
setTheme( { ...theme, uri: value } )
}
placeholder={ __(
'https://github.com/wordpress/twentytwentythree/',
'create-block-theme'
) }
/>
<TextControl
__nextHasNoMarginBottom
label={ __( 'Author', 'create-block-theme' ) }
value={ theme.author }
onChange={ ( value ) =>
setTheme( { ...theme, author: value } )
}
placeholder={ __(
'the WordPress team',
'create-block-theme'
) }
/>
<TextControl
__nextHasNoMarginBottom
label={ __( 'Author URI', 'create-block-theme' ) }
value={ theme.author_uri }
onChange={ ( value ) =>
setTheme( { ...theme, author_uri: value } )
}
placeholder={ __(
'https://wordpress.org/',
'create-block-theme'
) }
/>
<SelectControl
__nextHasNoMarginBottom
label={ __(
'Minimum WordPress version',
'create-block-theme'
) }
value={ theme.requires_wp }
options={ WP_MINIMUM_VERSIONS.map(
( version ) => ( {
label: version,
value: version,
} )
) }
onChange={ ( value ) => {
setTheme( { ...theme, requires_wp: value } );
} }
/>
</VStack>
</details>
<br />
{ createType === 'createClone' && (
Expand Down
4 changes: 3 additions & 1 deletion src/editor-sidebar/create-variation-panel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,9 @@ export const CreateVariationPanel = () => {

<View>
<Spacer paddingY={ 4 }>
<VStack>
<VStack spacing={ 4 }>
<TextControl
__nextHasNoMarginBottom
label={ __(
'Variation name',
'create-block-theme'
Expand All @@ -114,6 +115,7 @@ export const CreateVariationPanel = () => {
/>

<CheckboxControl
__nextHasNoMarginBottom
label={ __(
'Save Fonts',
'create-block-theme'
Expand Down
17 changes: 14 additions & 3 deletions src/editor-sidebar/metadata-editor-modal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export const ThemeMetadataEditorModal = ( { onRequestClose } ) => {
onRequestClose={ onRequestClose }
className="create-block-theme__metadata-editor-modal"
>
<VStack>
<VStack spacing={ 4 }>
<Text>
{ __(
'Edit Metadata properties of the current theme.',
Expand All @@ -159,11 +159,13 @@ export const ThemeMetadataEditorModal = ( { onRequestClose } ) => {
</Text>
<Spacer />
<TextControl
__nextHasNoMarginBottom
disabled
label={ __( 'Theme name', 'create-block-theme' ) }
value={ theme.name }
/>
<TextareaControl
__nextHasNoMarginBottom
label={ __( 'Theme description', 'create-block-theme' ) }
value={ theme.description }
onChange={ ( value ) =>
Expand All @@ -175,6 +177,7 @@ export const ThemeMetadataEditorModal = ( { onRequestClose } ) => {
) }
/>
<TextControl
__nextHasNoMarginBottom
label={ __( 'Theme URI', 'create-block-theme' ) }
value={ theme.uri }
onChange={ ( value ) =>
Expand All @@ -186,6 +189,7 @@ export const ThemeMetadataEditorModal = ( { onRequestClose } ) => {
) }
/>
<TextControl
__nextHasNoMarginBottom
label={ __( 'Author', 'create-block-theme' ) }
value={ theme.author }
onChange={ ( value ) =>
Expand All @@ -197,6 +201,7 @@ export const ThemeMetadataEditorModal = ( { onRequestClose } ) => {
) }
/>
<TextControl
__nextHasNoMarginBottom
label={ __( 'Author URI', 'create-block-theme' ) }
value={ theme.author_uri }
onChange={ ( value ) =>
Expand All @@ -208,6 +213,7 @@ export const ThemeMetadataEditorModal = ( { onRequestClose } ) => {
) }
/>
<TextControl
__nextHasNoMarginBottom
label={ __( 'Version', 'create-block-theme' ) }
value={ theme.version }
onChange={ ( value ) =>
Expand All @@ -219,6 +225,7 @@ export const ThemeMetadataEditorModal = ( { onRequestClose } ) => {
) }
/>
<SelectControl
__nextHasNoMarginBottom
label={ __(
'Minimum WordPress version',
'create-block-theme'
Expand All @@ -233,6 +240,7 @@ export const ThemeMetadataEditorModal = ( { onRequestClose } ) => {
} }
/>
<FormTokenField
__nextHasNoMarginBottom
label={ __( 'Theme tags', 'create-block-theme' ) }
value={
theme.tags_custom ? theme.tags_custom.split( ', ' ) : []
Expand All @@ -242,7 +250,6 @@ export const ThemeMetadataEditorModal = ( { onRequestClose } ) => {
<HStack
style={ {
marginTop: '-20px',
marginBottom: '1rem',
} }
>
<ExternalLink
Expand All @@ -256,6 +263,7 @@ export const ThemeMetadataEditorModal = ( { onRequestClose } ) => {
</ExternalLink>
</HStack>
<TextareaControl
__nextHasNoMarginBottom
label={ __( 'Recommended Plugins', 'create-block-theme' ) }
help={
<>
Expand Down Expand Up @@ -288,6 +296,7 @@ Plugin Description`,
/>

<TextareaControl
__nextHasNoMarginBottom
label={ __( 'Font credits', 'create-block-theme' ) }
help={
<>
Expand Down Expand Up @@ -327,6 +336,7 @@ ${ __( 'Source', 'create-block-theme' ) }` }
/>

<TextareaControl
__nextHasNoMarginBottom
label={ __( 'Image Credits', 'create-block-theme' ) }
help={
<>
Expand Down Expand Up @@ -358,7 +368,7 @@ Image license`,
}
/>

<BaseControl>
<BaseControl __nextHasNoMarginBottom>
<BaseControl.VisualLabel>
{ __( 'Screenshot', 'create-block-theme' ) }
</BaseControl.VisualLabel>
Expand Down Expand Up @@ -408,6 +418,7 @@ Image license`,
</MediaUploadCheck>
</BaseControl>
<TextControl
__nextHasNoMarginBottom
label={ __( 'Theme Subfolder', 'create-block-theme' ) }
value={ theme.subfolder }
onChange={ ( value ) =>
Expand Down
5 changes: 4 additions & 1 deletion src/editor-sidebar/reset-theme.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,9 @@ function ResetTheme() {
<ScreenHeader
title={ __( 'Reset Theme', 'create-block-theme' ) }
/>
<VStack>
<VStack spacing={ 4 }>
<CheckboxControl
__nextHasNoMarginBottom
label={ __(
'Reset theme styles',
'create-block-theme'
Expand All @@ -111,6 +112,7 @@ function ResetTheme() {
/>

<CheckboxControl
__nextHasNoMarginBottom
label={ __(
'Reset theme templates',
'create-block-theme'
Expand All @@ -126,6 +128,7 @@ function ResetTheme() {
/>

<CheckboxControl
__nextHasNoMarginBottom
label={ __(
'Reset theme template-parts',
'create-block-theme'
Expand Down
10 changes: 9 additions & 1 deletion src/editor-sidebar/save-panel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,9 @@ export const SaveThemePanel = () => {
<ScreenHeader
title={ __( 'Save Changes', 'create-block-theme' ) }
/>
<VStack>
<VStack spacing={ 4 }>
<CheckboxControl
__nextHasNoMarginBottom
label={ __( 'Save Fonts', 'create-block-theme' ) }
help={ __(
'Save activated fonts in the Font Library to the theme. Remove deactivated theme fonts from the theme.',
Expand All @@ -113,6 +114,7 @@ export const SaveThemePanel = () => {
onChange={ () => handleTogglePreference( 'saveFonts' ) }
/>
<CheckboxControl
__nextHasNoMarginBottom
label={ __( 'Save Style Changes', 'create-block-theme' ) }
help={ __(
'Save Global Styles values set in the Editor to the theme.',
Expand All @@ -122,6 +124,7 @@ export const SaveThemePanel = () => {
onChange={ () => handleTogglePreference( 'saveStyle' ) }
/>
<CheckboxControl
__nextHasNoMarginBottom
label={ __(
'Save Template Changes',
'create-block-theme'
Expand All @@ -134,6 +137,7 @@ export const SaveThemePanel = () => {
onChange={ () => handleTogglePreference( 'saveTemplates' ) }
/>
<CheckboxControl
__nextHasNoMarginBottom
label={ __(
'Process Only Modified Templates',
'create-block-theme'
Expand All @@ -152,6 +156,7 @@ export const SaveThemePanel = () => {
}
/>
<CheckboxControl
__nextHasNoMarginBottom
label={ __( 'Save Synced Patterns', 'create-block-theme' ) }
help={ __(
'Any synced patterns created in the Editor will be moved to the theme. Note that this will delete all synced patterns from the Editor and any references in templates will be made relative to the theme.',
Expand All @@ -161,6 +166,7 @@ export const SaveThemePanel = () => {
onChange={ () => handleTogglePreference( 'savePatterns' ) }
/>
<CheckboxControl
__nextHasNoMarginBottom
label={ __( 'Localize Text', 'create-block-theme' ) }
help={ __(
'Any text in a template or pattern will be localized in a pattern.',
Expand All @@ -177,6 +183,7 @@ export const SaveThemePanel = () => {
onChange={ () => handleTogglePreference( 'localizeText' ) }
/>
<CheckboxControl
__nextHasNoMarginBottom
label={ __( 'Localize Images', 'create-block-theme' ) }
help={ __(
'Any images in a template or pattern will be copied to a local /assets folder and referenced from there via a pattern.',
Expand All @@ -195,6 +202,7 @@ export const SaveThemePanel = () => {
}
/>
<CheckboxControl
__nextHasNoMarginBottom
label={ __(
'Remove Navigation Refs',
'create-block-theme'
Expand Down
Loading

0 comments on commit ffa9186

Please sign in to comment.