Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues Activity

Added author name as an additional check for official themes (#21665)

Browse source 
ref DES-982

- we're hiding font-related theme settings from official themes to make room for the new custom font settings
- this adds author name as an additional check on top of the existing ones (theme name and corresponding setting keys)
This commit is contained in:
Sodbileg Gansukh 2024-11-21 12:04:24 +08:00 • committed by GitHub
parent 68d8262fab
commit 1f501c1e58
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/admin-x-framework/src/api/themes.ts
View file

@ -10,6 +10,9 @@ export type Theme = {
name?: string;
description?: string;
version?: string;
author?: {
name?: string;
}
};
templates?: string[];
}

3
apps/admin-x-settings/src/components/settings/site/designAndBranding/ThemeSettings.tsx
View file

@ -44,6 +44,7 @@ const ThemeSettings: React.FC<ThemeSettingsProps> = ({sections, updateSetting})
const {data: themesData} = useBrowseThemes();
const activeTheme = themesData?.themes.find((theme: Theme) => theme.active);
const activeThemeName = activeTheme?.package.name?.toLowerCase() || '';
const activeThemeAuthor = activeTheme?.package.author?.name || '';
const hasCustomFonts = useFeatureFlag('customFonts');
return (
@ -69,7 +70,7 @@ const ThemeSettings: React.FC<ThemeSettingsProps> = ({sections, updateSetting})
// should be removed once we remove the settings from the themes in 6.0
if (hasCustomFonts) {
const hidingSettings = themeSettingsMap[activeThemeName];
if (hidingSettings && hidingSettings.includes(setting.key)) {
if (hidingSettings && hidingSettings.includes(setting.key) && activeThemeAuthor === 'Ghost Foundation') {
spaceClass += ' hidden';
}
}