diff --git a/ghost/admin-x-settings/src/components/Sidebar.tsx b/ghost/admin-x-settings/src/components/Sidebar.tsx index d0e9e237e0..a19cea09de 100644 --- a/ghost/admin-x-settings/src/components/Sidebar.tsx +++ b/ghost/admin-x-settings/src/components/Sidebar.tsx @@ -25,6 +25,7 @@ const Sidebar: React.FC = () => { + diff --git a/ghost/admin-x-settings/src/components/settings/site/DesignModal.tsx b/ghost/admin-x-settings/src/components/settings/site/DesignModal.tsx index 7c69ef6e77..29d0f5ea5c 100644 --- a/ghost/admin-x-settings/src/components/settings/site/DesignModal.tsx +++ b/ghost/admin-x-settings/src/components/settings/site/DesignModal.tsx @@ -1,9 +1,7 @@ import BrandSettings, {BrandSettingValues} from './designAndBranding/BrandSettings'; -import ChangeThemeModal from './designAndBranding/ChangeThemeModal'; import ConfirmationModal from '../../../admin-x-ds/global/ConfirmationModal'; import NiceModal, {useModal} from '@ebay/nice-modal-react'; import React, {useContext, useEffect, useState} from 'react'; -import StickyFooter from '../../../admin-x-ds/global/StickyFooter'; import TabView, {Tab} from '../../../admin-x-ds/global/TabView'; import ThemePreview from './designAndBranding/ThemePreview'; import ThemeSettings from './designAndBranding/ThemeSettings'; @@ -20,14 +18,12 @@ const Sidebar: React.FC<{ themeSettingSections: Array<{id: string, title: string, settings: CustomThemeSetting[]}> updateThemeSetting: (updated: CustomThemeSetting) => void onTabChange: (id: string) => void - onChangeTheme: () => void }> = ({ brandSettings, updateBrandSetting, themeSettingSections, updateThemeSetting, - onTabChange, - onChangeTheme + onTabChange }) => { const tabs: Tab[] = [ { @@ -47,12 +43,6 @@ const Sidebar: React.FC<{
- - - ); }; @@ -165,10 +155,6 @@ const DesignModal: React.FC = () => { } }; - const showThemeModal = () => { - NiceModal.show(ChangeThemeModal); - }; - let selectedTabURL = getHomepageUrl(siteData!); switch (selectedPreviewTab) { case 'homepage': @@ -197,7 +183,6 @@ const DesignModal: React.FC = () => { themeSettingSections={themeSettingSections} updateBrandSetting={updateBrandSetting} updateThemeSetting={updateThemeSetting} - onChangeTheme={showThemeModal} onTabChange={onTabChange} />; diff --git a/ghost/admin-x-settings/src/components/settings/site/DesignSetting.tsx b/ghost/admin-x-settings/src/components/settings/site/DesignSetting.tsx index 3e90507d43..307ed9b681 100644 --- a/ghost/admin-x-settings/src/components/settings/site/DesignSetting.tsx +++ b/ghost/admin-x-settings/src/components/settings/site/DesignSetting.tsx @@ -12,7 +12,7 @@ const DesignSetting: React.FC = () => { return ( } - description="Customize your site and manage themes" + description="Customize the look and feel of your site" navid='branding-and-design' testId='design' title="Branding and design" diff --git a/ghost/admin-x-settings/src/components/settings/site/SiteSettings.tsx b/ghost/admin-x-settings/src/components/settings/site/SiteSettings.tsx index 133478190b..de8ccb75e9 100644 --- a/ghost/admin-x-settings/src/components/settings/site/SiteSettings.tsx +++ b/ghost/admin-x-settings/src/components/settings/site/SiteSettings.tsx @@ -7,8 +7,8 @@ const SiteSettings: React.FC = () => { return ( <> - + );