diff --git a/src/Project/Sugcon2024/Sugcon/src/Theme.ts b/src/Project/Sugcon2024/Sugcon/src/Theme.ts index 9b2401297..a8306f53c 100644 --- a/src/Project/Sugcon2024/Sugcon/src/Theme.ts +++ b/src/Project/Sugcon2024/Sugcon/src/Theme.ts @@ -27,6 +27,12 @@ const Button = defineStyleConfig({ px: '42px', py: '24px', }, + navButtonLinkSm: { + fontSize: '22px', + }, + navButtonLinkLg: { + fontSize: '18px', + }, }, // Two variants: outline and solid variants: { @@ -81,6 +87,9 @@ const Link = defineStyleConfig({ }, sizes: { sm: { + fontSize: '22px', + }, + md: { fontSize: '16px', }, lg: { @@ -97,7 +106,6 @@ const Link = defineStyleConfig({ fontSize: '16px', }, navLink: { - fontSize: '18px', fontWeight: 'bold', color: 'sugcon.800', textDecoration: 'none', diff --git a/src/Project/Sugcon2024/Sugcon/src/components/Basic Components/Logo.tsx b/src/Project/Sugcon2024/Sugcon/src/components/Basic Components/Logo.tsx index 93bc104c2..674d84881 100644 --- a/src/Project/Sugcon2024/Sugcon/src/components/Basic Components/Logo.tsx +++ b/src/Project/Sugcon2024/Sugcon/src/components/Basic Components/Logo.tsx @@ -9,7 +9,7 @@ import { useSitecoreContext, } from '@sitecore-jss/sitecore-jss-nextjs'; import clsx from 'clsx'; -import { Box } from '@chakra-ui/react'; +import { Box, Flex } from '@chakra-ui/react'; interface Fields { Image: ImageField; @@ -72,7 +72,7 @@ export const Default = (props: LogoProps): JSX.Element => { px="0" mr="15px" > - + {sitecoreContext?.pageState === 'edit' || !props?.fields?.TargetUrl?.value?.href ? ( ) : ( @@ -80,7 +80,7 @@ export const Default = (props: LogoProps): JSX.Element => { )} - + : } className={clsx(element?.Styles)} @@ -231,6 +232,7 @@ const NavigationItem = ({ element, pageEditing }: NavigationItemProps): JSX.Elem field={getLinkField(element)} editable={pageEditing} variant="navLink" + size={{ base: 'sm', lg: 'lg' }} > {getNavigationText(element)} @@ -247,6 +249,7 @@ const renderChildNavigationItem = ({ { shadow="xl" minH={{ base: HeaderHeights.Mobile, lg: HeaderHeights.Desktop }} > - + {route && } diff --git a/src/Project/Sugcon2024/Sugcon/src/components/Templates/LayoutConstants.ts b/src/Project/Sugcon2024/Sugcon/src/components/Templates/LayoutConstants.ts index f3edbf116..72a0d87d5 100644 --- a/src/Project/Sugcon2024/Sugcon/src/components/Templates/LayoutConstants.ts +++ b/src/Project/Sugcon2024/Sugcon/src/components/Templates/LayoutConstants.ts @@ -22,8 +22,8 @@ type SizeConfig = { }; export const responsiveButtonSizeConfig: SizeConfig = { - base: 'sm', - md: 'sm', + base: 'lg', + md: 'lg', lg: 'sm', xl: 'lg', }; diff --git a/src/Project/Sugcon2024/Sugcon/src/stories/templates/Header.stories.tsx b/src/Project/Sugcon2024/Sugcon/src/stories/templates/Header.stories.tsx index 43133dfac..ad7b5c3f2 100644 --- a/src/Project/Sugcon2024/Sugcon/src/stories/templates/Header.stories.tsx +++ b/src/Project/Sugcon2024/Sugcon/src/stories/templates/Header.stories.tsx @@ -40,6 +40,10 @@ const route = { componentName: 'Logo', dataSource: '{20C73871-7E77-4F6E-9D35-C518AB120F44}', ...Logo.args, + fields: { + ...Logo.args.fields, + ImageCaption: null, + }, }, { ...PrimaryNavigation.args.rendering,