diff --git a/ghost/admin-x-settings/src/admin-x-ds/settings/SettingGroup.tsx b/ghost/admin-x-settings/src/admin-x-ds/settings/SettingGroup.tsx index def8a8076b..9f53cb10ef 100644 --- a/ghost/admin-x-settings/src/admin-x-ds/settings/SettingGroup.tsx +++ b/ghost/admin-x-settings/src/admin-x-ds/settings/SettingGroup.tsx @@ -6,6 +6,7 @@ import {IButton} from '../global/Button'; export type TSettingGroupStates = 'view' | 'edit' | 'unsaved'; interface SettingGroupProps { + navid?:string; title?: string; description?: React.ReactNode; state?: TSettingGroupStates; @@ -22,6 +23,7 @@ interface SettingGroupProps { } const SettingGroup: React.FC = ({ + navid, title, description, state, @@ -93,7 +95,7 @@ const SettingGroup: React.FC = ({ } return ( -
+
{customHeader ? customHeader : {customButtons ? customButtons : diff --git a/ghost/admin-x-settings/src/admin-x-ds/settings/SettingNavItem.tsx b/ghost/admin-x-settings/src/admin-x-ds/settings/SettingNavItem.tsx index 2bcc7e18e9..1dc1d8b178 100644 --- a/ghost/admin-x-settings/src/admin-x-ds/settings/SettingNavItem.tsx +++ b/ghost/admin-x-settings/src/admin-x-ds/settings/SettingNavItem.tsx @@ -1,12 +1,13 @@ import React from 'react'; interface Props { - title: string; + title: React.ReactNode; + href?: string; } -const SettingNavItem: React.FC = ({title}) => { +const SettingNavItem: React.FC = ({title, href}) => { return ( -
  • {title}
  • +
  • {title}
  • ); }; diff --git a/ghost/admin-x-settings/src/components/Sidebar.tsx b/ghost/admin-x-settings/src/components/Sidebar.tsx index 661b1497c4..f8c8c23a18 100644 --- a/ghost/admin-x-settings/src/components/Sidebar.tsx +++ b/ghost/admin-x-settings/src/components/Sidebar.tsx @@ -6,7 +6,7 @@ const Sidebar: React.FC = () => { return (
    - + diff --git a/ghost/admin-x-settings/src/components/settings/general/TitleAndDescription.tsx b/ghost/admin-x-settings/src/components/settings/general/TitleAndDescription.tsx index 0cfa1408c0..87747a3bbf 100644 --- a/ghost/admin-x-settings/src/components/settings/general/TitleAndDescription.tsx +++ b/ghost/admin-x-settings/src/components/settings/general/TitleAndDescription.tsx @@ -66,6 +66,7 @@ const TitleAndDescription: React.FC = () => { return (