Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion assets/src/admin/patterns/components/MemoizedPatternPreview.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,16 @@ const MemoizedPatternPreview = memo(
} }
>
<div className="onedesign-pattern-title-wrapper">
{ isCheckBoxRequired && <CheckboxControl checked={ isSelected } /> }
{ isCheckBoxRequired &&
<CheckboxControl
checked={ isSelected }
onChange={ () => onSelect( pattern ) }
onClick={ ( e ) => {
e.stopPropagation();
} }
__nextHasNoMarginBottom
/>
}
<span className="onedesign-pattern-title">{ patternTitle }</span>
</div>

Expand Down
1 change: 1 addition & 0 deletions assets/src/admin/patterns/components/PatternModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
} from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { useSelect, useDispatch } from '@wordpress/data';
import apiFetch from '@wordpress/api-fetch';

Check warning on line 19 in assets/src/admin/patterns/components/PatternModal.js

View workflow job for this annotation

GitHub Actions / Lint JS and CSS

Using exported name 'apiFetch' as identifier for default import
import { cog } from '@wordpress/icons';

/**
Expand Down Expand Up @@ -440,6 +440,7 @@
value={ searchTerm }
onChange={ handleSearchChange }
placeholder={ __( 'Search patterns…', 'onedesign' ) }
__nextHasNoMarginBottom
/>
{ renderSearchResults() }
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ const MemoizedTemplatePreview = memo(
onClick={ ( e ) => {
e.stopPropagation();
} }
__nextHasNoMarginBottom
/> }
<span className="onedesign-template-title">{ templateTitle }</span>
</div>
Expand Down
1 change: 1 addition & 0 deletions assets/src/admin/templates/components/TemplateModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ const TemplateModal = () => {
onChange={ ( value ) => setSearchQuery( value ) }
placeholder={ __( 'Search Templates', 'onedesign' ) }
className="onedesign-template-search"
__nextHasNoMarginBottom
/>
<TabPanel
className="onedesign-template-tabs"
Expand Down
1 change: 1 addition & 0 deletions assets/src/components/MultiSites.js
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ const MultiSites = ( { setBrandSites, brandSites, setNotice } ) => {
label={ `${ site.name } ( ${ site?.url } )` }
checked={ selectedSites.includes( site.id ) }
onChange={ () => toggleSiteSelection( site.id ) }
__nextHasNoMarginBottom
/>
) ) }
</div>
Expand Down
8 changes: 7 additions & 1 deletion assets/src/components/SiteModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -282,20 +282,25 @@ const SiteModal = ( { formData, setFormData, onSubmit, onClose, editing, origina
onChange={ ( value ) => setFormData( { ...formData, name: value } ) }
error={ errors.name }
help={ __( 'This is the name of the site that will be registered.', 'onedesign' ) }
__next40pxDefaultSize
__nextHasNoMarginBottom
/>
<TextControl
label={ __( 'Site URL*', 'onedesign' ) }
value={ formData.url }
onChange={ ( value ) => setFormData( { ...formData, url: value } ) }
error={ errors.url }
help={ __( 'It must start with http or https and end with /, like: https://onedesign.com/', 'onedesign' ) }
help={ __( 'It must start with http or https and end with /, like: https://rtcamp.com/', 'onedesign' ) }
__next40pxDefaultSize
__nextHasNoMarginBottom
/>

{ /* Logo Media Selection */ }
<BaseControl
id="site-logo"
label={ __( 'Site Logo', 'onedesign' ) }
help={ __( 'Select a logo for this brand site.', 'onedesign' ) }
__nextHasNoMarginBottom
>
<div style={ { marginTop: '8px' } }>
{ formData.logo && (
Expand Down Expand Up @@ -353,6 +358,7 @@ const SiteModal = ( { formData, setFormData, onSubmit, onClose, editing, origina
onChange={ ( value ) => setFormData( { ...formData, api_key: value } ) }
error={ errors.api_key }
help={ __( 'This is the api key that will be used to authenticate the site for onedesign.', 'onedesign' ) }
__nextHasNoMarginBottom
/>

<Button
Expand Down
3 changes: 3 additions & 0 deletions assets/src/components/SiteSettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ const SiteSettings = () => {
value={ apiKey }
disabled={ true }
help={ __( 'This key is used for secure communication with the Governing site.', 'onedesign' ) }
__nextHasNoMarginBottom
/>
</div>
</CardBody>
Expand All @@ -247,6 +248,8 @@ const SiteSettings = () => {
value={ governingSite }
disabled={ true }
help={ __( 'This is the URL of the Governing site this Brand site is connected to.', 'onedesign' ) }
__next40pxDefaultSize
__nextHasNoMarginBottom
/>
</CardBody>
</Card>
Expand Down
Loading