Merge branch 'develop' into fix/global-color-schemes-inherit-values-for-hover

kaeizen · kaeizen · commit 5016923143cf · 2025-03-27T02:03:19.000+08:00
# Conflicts:
#	src/plugins/global-settings/color-schemes/index.php
#	src/plugins/global-settings/color-schemes/utils.js
diff --git a/src/plugins/global-settings/color-schemes/utils.js b/src/plugins/global-settings/color-schemes/utils.js
@@ -110,10 +110,7 @@ export const getCSS = ( scheme, currentHoverState = 'normal', mode = '' ) => {
 			}
 
 			if ( currentHoverState !== 'normal' ) {
-				const currentHover = mode === '' && currentHoverState === 'parent-hover' ? ''
-					: ( currentHoverState === 'hover' && ! scheme[ property ]?.desktopHover ) ? '-parent-hover'
-						: `-${ currentHoverState }`
-
+				const currentHover = mode === '' && currentHoverState === 'parent-hover' ? '' : `-${ currentHoverState }`
 				decls.desktopHover.push( `${ customProperty }-current-hover: var(${ customProperty }${ currentHover });` )
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,7 @@ export const getCSS = ( scheme, currentHoverState = 'normal', mode = '' ) => {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`if ( currentHoverState !== 'normal' ) {`
`113`		`- const currentHover = mode === '' && currentHoverState === 'parent-hover' ? ''`
`114`		`- : ( currentHoverState === 'hover' && ! scheme[ property ]?.desktopHover ) ? '-parent-hover'`
`115`		- : `-${ currentHoverState }`
`116`		`-`
	`113`	+ const currentHover = mode === '' && currentHoverState === 'parent-hover' ? '' : `-${ currentHoverState }`
`117`	`114`	decls.desktopHover.push( `${ customProperty }-current-hover: var(${ customProperty }${ currentHover });` )
`118`	`115`	`}`
`119`	`116`