Skip to content
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

Yith Wonder 1.2.0: Adjust Onboarding Colors and Fonts #154

Merged
merged 3 commits into from
Jan 17, 2023
Merged

Yith Wonder 1.2.0: Adjust Onboarding Colors and Fonts #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c18ca96
switch to base and contrast
arunshenoy99 Jan 17, 2023
17eb609
fix site title and site tagline fonts for the gold shades
arunshenoy99 Jan 17, 2023
ec430f9
Merge branch 'trunk' of https://github.com/newfold-labs/wp-module-onb…
arunshenoy99 Jan 17, 2023
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
4 changes: 2 additions & 2 deletions includes/Data/Flows.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ final class Flows {
'color' => '',
),
array(
'slug' => 'background',
'name' => 'Background',
'slug' => 'base',
'name' => 'Base',
'color' => '',
),
),
Expand Down
27 changes: 14 additions & 13 deletions includes/Data/Themes/Colors.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

namespace NewfoldLabs\WP\Module\Onboarding\Data\Themes;

/**
* Contains custom color palettes for a given theme.
*/
final class Colors {



/**
* This contains the different color variations for the theme.
*
Expand All @@ -22,7 +23,7 @@ final class Colors {
'tertiary' => '#C7DBFF',
'secondary' => '#344A77',
'primary' => '#1A4733',
'background' => '#FFFFFF',
'base' => '#FFFFFF',
),
'cool' => array(
'header-background' => '#C7DBFF',
Expand All @@ -33,7 +34,7 @@ final class Colors {
'tertiary' => '#C7DBFF',
'secondary' => '#3764B4',
'primary' => '#21447B',
'background' => '#FFFFFF',
'base' => '#FFFFFF',
),
'warm' => array(
'header-background' => '#FDE5D0',
Expand All @@ -44,7 +45,7 @@ final class Colors {
'tertiary' => '#FFEDED',
'secondary' => '#B97040',
'primary' => '#7A3921',
'background' => '#FFFFFF',
'base' => '#FFFFFF',
),
'radiant' => array(
'header-background' => '#63156A',
Expand All @@ -55,7 +56,7 @@ final class Colors {
'tertiary' => '#C7F0FF',
'secondary' => '#64288C',
'primary' => '#63156A',
'background' => '#FFFFFF',
'base' => '#FFFFFF',
),
'bold' => array(
'header-background' => '#FFD7F1',
Expand All @@ -66,7 +67,7 @@ final class Colors {
'tertiary' => '#F2A3D6',
'secondary' => '#076D66',
'primary' => '#09857C',
'background' => '#FFFFFF',
'base' => '#FFFFFF',
),
'retro' => array(
'header-background' => '#096385',
Expand All @@ -77,7 +78,7 @@ final class Colors {
'tertiary' => '#F2E6A2',
'secondary' => '#BE9E00',
'primary' => '#096385',
'background' => '#FFFFFF',
'base' => '#FFFFFF',
),
'professional' => array(
'header-background' => '#6D8258',
Expand All @@ -88,7 +89,7 @@ final class Colors {
'tertiary' => '#d6e4f9',
'secondary' => '#405F1C',
'primary' => '#558320',
'background' => '#FFFFFF',
'base' => '#FFFFFF',
),
'crisp' => array(
'header-background' => '#ccc',
Expand All @@ -99,7 +100,7 @@ final class Colors {
'tertiary' => '#777',
'secondary' => '#17222E',
'primary' => '#223344',
'background' => '#FFFFFF',
'base' => '#FFFFFF',
),
'polished' => array(
'header-background' => '#313131',
Expand All @@ -110,7 +111,7 @@ final class Colors {
'tertiary' => '#313131',
'secondary' => '#6B69EA',
'primary' => '#5100FA',
'background' => '#FFFFFF',
'base' => '#FFFFFF',
),
'nightowl' => array(
'header-background' => '#06080A',
Expand All @@ -121,7 +122,7 @@ final class Colors {
'tertiary' => '#FFDFA3',
'secondary' => '#06080A',
'primary' => '#B97900',
'background' => '#FFFFFF',
'base' => '#FFFFFF',
),
'subtle' => array(
'header-background' => '#C7ADBB',
Expand All @@ -132,7 +133,7 @@ final class Colors {
'tertiary' => '#D4C9CF',
'secondary' => '#57203c',
'primary' => '#5A3C4B',
'background' => '#FFFFFF',
'base' => '#FFFFFF',
),
),
);
Expand Down
41 changes: 22 additions & 19 deletions src/OnboardingSPA/components/Drawer/DrawerPanel/DesignColors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ const DesignColors = () => {
case 'primary':
case 'secondary':
case 'tertiary':
case 'background':
case 'foreground':
case 'base':
case 'contrast':
/* YITH WONDER */
case 'header-background':
case 'header-foreground':
Expand All @@ -95,19 +95,24 @@ const DesignColors = () => {
const slug = selectedThemeColorPalette[ idx ]?.slug;
if (
isCustomStyle &&
selectedColorsLocalTemp?.[slug] != ''
selectedColorsLocalTemp?.[ slug ] != ''
)
selectedThemeColorPalette[ idx ].color = selectedColorsLocalTemp[slug];
selectedThemeColorPalette[ idx ].color =
selectedColorsLocalTemp[ slug ];
/**
* Add Exception for Background.
* (perhaps scope to yith-wonder in future)
*/
else if ( colorPalettesTemp?.[colorStyle]?.[slug] && 'background' === slug ) {
*/ else if (
colorPalettesTemp?.[ colorStyle ]?.[ slug ] &&
'base' === slug
) {
selectedThemeColorPalette[ idx ].color = '#FFFFFF';
}
else if ( ! isCustomStyle && colorPalettesTemp?.[colorStyle]?.[slug] ) {
} else if (
! isCustomStyle &&
colorPalettesTemp?.[ colorStyle ]?.[ slug ]
) {
selectedThemeColorPalette[ idx ].color =
colorPalettesTemp[ colorStyle ][slug];
colorPalettesTemp[ colorStyle ][ slug ];
}
break;
}
Expand All @@ -134,13 +139,13 @@ const DesignColors = () => {
if ( selectedThemeColorPalette ) {
for ( let idx = 0; idx < selectedThemeColorPalette.length; idx++ ) {
switch ( selectedThemeColorPalette[ idx ]?.slug ) {
case 'background':
case 'base':
if (
colorPickerCalledBy == 'background' &&
customColors?.background
colorPickerCalledBy == 'base' &&
customColors?.base
)
selectedThemeColorPalette[ idx ].color =
customColors?.background;
customColors?.base;
break;
case 'primary':
if (
Expand Down Expand Up @@ -350,22 +355,20 @@ const DesignColors = () => {
>
<div
className="custom-palette__below-row"
onClick={ ( e ) => selectCustomColor( 'background' ) }
onClick={ ( e ) => selectCustomColor( 'base' ) }
>
<div
className={ `custom-palette__below-row-icon ${
customColors?.background &&
customColors?.base &&
'custom-palette__below-row-icon_selected_border'
}` }
style={ {
backgroundColor: `${
customColors?.background ?? '#FFF'
customColors?.base ?? '#FFF'
}`,
} }
>
{ customColors?.background ? (
<div>&#10003;</div>
) : null }
{ customColors?.base ? <div>&#10003;</div> : null }
</div>
<div className="custom-palette__below-row-text">
Background
Expand Down
25 changes: 24 additions & 1 deletion src/OnboardingSPA/components/Drawer/DrawerPanel/DesignTypography.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,29 @@ const DesignTypography = () => {
fontPalettesCopy[ fontStyle ]?.styles.blocks[
'core/heading'
].typography.fontFamily;
if (
globalStylesCopy.styles?.blocks[ 'core/site-title' ]?.typography
.fontFamily
) {
globalStylesCopy.styles.blocks[
'core/site-title'
].typography.fontFamily =
fontPalettesCopy[ fontStyle ]?.styles.blocks[
'core/heading'
].typography.fontFamily;
}

if (
globalStylesCopy.styles?.blocks[ 'core/site-tagline' ]?.typography
.fontFamily
) {
globalStylesCopy.styles.blocks[
'core/site-tagline'
].typography.fontFamily =
fontPalettesCopy[ fontStyle ]?.styles.blocks[
'core/heading'
].typography.fontFamily;
}

// Saves the data to the Store
currentData.data.typography.slug = fontStyle;
Expand Down Expand Up @@ -188,7 +211,7 @@ const DesignTypography = () => {
</div>
} */ }
{ fontPalettes && buildPalettes() }
{/* { fontPalettes && buildCustomPalette() } */}
{ /* { fontPalettes && buildCustomPalette() } */ }
<div className="custom-font-palette--hidden">{ rerender }</div>
</div>
</GlobalStylesProvider>
Expand Down