Merge branch 'develop' into feat/global-color-schemes

Author: kaeizen

src/plugins/global-settings/block-defaults/index.js

@@ -101,4 +101,4 @@ addFilter( 'stackable.global-settings.inspector', 'stackable/default-blocks', ou
 			</PanelAdvancedSettings>
 		</>
 	)
-} )
+}, 80 )

src/plugins/global-settings/buttons-and-icons/index.js

@@ -368,7 +368,7 @@ addFilter( 'stackable.global-settings.inspector', 'stackable/global-buttons-and-
 			</PanelAdvancedSettings>
 		</>
 	)
-} )
+}, 10 )
 
 export const GlobalButtonsAndIconsStyles = () => {
 	const styles = useBlockLayoutEditorLoader( 'stackable/global-buttons-and-icons' )

src/plugins/global-settings/color-schemes/index.js

@@ -53,7 +53,7 @@ addFilter( 'stackable.global-settings.inspector', 'stackable/global-color-scheme
 			</PanelAdvancedSettings>
 		</Fragment>
 	)
-} )
+}, 2 )
 
 addFilter( 'stackable.global-settings.inspector.global-colors.toggle-controls', 'stackable/global-color-schemes', output => {
 	const { hideColorSchemeColors } = useSelect( select => select( 'stackable/global-color-schemes' ).getSettings() )

src/plugins/global-settings/colors/index.js

@@ -107,7 +107,9 @@ addFilter( 'stackable.global-settings.inspector', 'stackable/global-colors', out
 	return (
 		<Fragment>
 			{ output }
-			<PanelAdvancedSettings title={ __( 'Global Color Palette', i18n ) }>
+			<PanelAdvancedSettings
+				title={ __( 'Global Color Palette', i18n ) }
+			>
 				<p className="components-base-control__help">
 					{ __( 'Change your color palette for all your blocks across your site.', i18n ) }
 					&nbsp;
@@ -139,7 +141,7 @@ addFilter( 'stackable.global-settings.inspector', 'stackable/global-colors', out
 			</PanelAdvancedSettings>
 		</Fragment>
 	)
-} )
+}, 4 )
 
 // Convert hex colors to global colors in Stackable blocks.
 addFilter( 'stackable.color-palette-control.change', 'stackable/global-colors', ( value, colorObject ) => {

src/plugins/global-settings/icon-library.js

@@ -32,5 +32,5 @@ if ( showProNotice || isPro ) {
 				</PanelAdvancedSettings>
 			</Fragment>
 		)
-	} )
+	}, 12 )
 }

src/plugins/global-settings/index.js

@@ -24,6 +24,7 @@ import { registerPlugin } from '@wordpress/plugins'
 import { __ } from '@wordpress/i18n'
 import { applyFilters, addAction } from '@wordpress/hooks'
 import { dispatch, select } from '@wordpress/data'
+import { PanelBody } from '@wordpress/components'
 
 // Action used to toggle the global settings panel.
 addAction( 'stackable.global-settings.toggle-sidebar', 'toggle', () => {
@@ -49,7 +50,15 @@ const GlobalSettings = () => {
 					name="sidebar"
 					title={ __( 'Stackable Settings', i18n ) }
 					className="ugb-global-settings__inspector"
-					icon={ <SVGStackableIcon /> } >
+					icon={ <SVGStackableIcon /> }
+				>
+					<PanelBody>
+						<p>
+							{ __( 'Set global styles and settings for your Stackable blocks to create a consistent design across your site. All the settings below will apply globally.', i18n ) }
+							{ /* &nbsp;
+							<a href="https://docs.wpstackable.com/article/465-how-to-style-the-different-block-hover-states?utm_source=wp-settings-global-settings&utm_campaign=learnmore&utm_medium=wp-dashboard" target="_docs">{ __( 'Learn more', i18n ) }</a> */ }
+						</p>
+					</PanelBody>
 					{ applyFilters( 'stackable.global-settings.inspector', null ) }
 				</PluginSidebar>
 			}

src/plugins/global-settings/spacing-and-borders/index.js

@@ -397,7 +397,7 @@ addFilter( 'stackable.global-settings.inspector', 'stackable/global-spacing-and-
 			</PanelAdvancedSettings>
 		</>
 	)
-} )
+}, 8 )
 
 export const GlobalSpacingAndBordersStyles = () => {
 	const styles = useBlockLayoutEditorLoader( 'stackable/global-spacing-and-borders' )

src/plugins/global-settings/typography/index.js

@@ -401,4 +401,4 @@ addFilter( 'stackable.global-settings.inspector', 'stackable/global-typography',
 			</PanelAdvancedSettings>
 		</Fragment>
 	)
-} )
+}, 4 )