Skip to content

fix (color schemes): remove color scheme styles in editor if there are no color schemes #3622

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

Closed
kaeizen wants to merge 1 commit into from
Closed

fix (color schemes): remove color scheme styles in editor if there are no color schemes #3622

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions src/plugins/global-settings/color-schemes/editor-loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@ export const renderGlobalColorSchemeStyles = (
css += bgcss
}

// This fixes the issue wherein if there is a background scheme and no container/base scheme, the container inherits the background scheme which may cause the text to be unreadable
const addContainerSchemeDefaultColors = containerModeColorScheme in colorSchemes && ! schemeHasValue( colorSchemes[ containerModeColorScheme ] ) &&
(
// Add default container scheme if background scheme has value
( backgroundModeColorScheme in colorSchemes && schemeHasValue( colorSchemes[ backgroundModeColorScheme ] ) ) ||
// Add default container scheme if there are color schemes other than the default scheme and background scheme
( colorSchemesArray.length !== 2 )
)

if ( containerModeColorScheme in colorSchemes && schemeHasValue( colorSchemes[ containerModeColorScheme ] ) ) {
decls = getCSS( colorSchemes[ containerModeColorScheme ], currentHoverState, 'container' )
let containercss = ''
Expand All @@ -79,8 +88,7 @@ export const renderGlobalColorSchemeStyles = (
containercss += `.stk-container:where(:not(.stk--no-background):hover), :where(.stk-hover-parent:hover) .stk-container:where(:not(.stk--no-background)){ ${ decls.desktopParentHover.join( '' ) } }\n`
}
css += containercss
// This fixes the issue wherein if there is a background scheme and no container/base scheme, the container inherits the background scheme which may cause the text to be unreadable
} else if ( containerModeColorScheme in colorSchemes && ! schemeHasValue( colorSchemes[ containerModeColorScheme ] ) ) {
} else if ( addContainerSchemeDefaultColors ) {
const containercss = `.stk-container:where(:not(.stk--no-background)){ ${ getDefaultColors() } }\n`

css += applyFilters( 'stackable.global-settings.global-color-schemes.default-container-scheme', containercss )
Expand Down
Loading