diff --git a/packages/client/public/favicon-16x16.png b/packages/client/public/favicon-16x16.png index 952c439a64..67e4ce64e4 100644 Binary files a/packages/client/public/favicon-16x16.png and b/packages/client/public/favicon-16x16.png differ diff --git a/packages/client/public/favicon-32x32.png b/packages/client/public/favicon-32x32.png index 9b9d567645..e9dddf1355 100644 Binary files a/packages/client/public/favicon-32x32.png and b/packages/client/public/favicon-32x32.png differ diff --git a/packages/client/scripts/getClientSettings.ts b/packages/client/scripts/getClientSettings.ts index b7d7b9a709..cb375b81b8 100644 --- a/packages/client/scripts/getClientSettings.ts +++ b/packages/client/scripts/getClientSettings.ts @@ -23,9 +23,9 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20 Ethereal Engine. All Rights Reserved. */ -import knex from 'knex' - import { ClientSettingDatabaseType, clientSettingPath } from '../../common/src/schemas/setting/client-setting.schema' + +import knex from 'knex' import { clientDbToSchema } from '../../server-core/src/setting/client-setting/client-setting.resolvers' export const getClientSetting = async () => { @@ -47,7 +47,7 @@ export const getClientSetting = async () => { .then(([dbClient]) => { const dbClientConfig = clientDbToSchema(dbClient) || { logo: './logo.svg', - title: 'Ethereal Engine', + title: 'IR Engine', url: 'https://local.etherealengine.org', releaseName: 'local', siteDescription: 'Connected Worlds for Everyone', diff --git a/packages/ui/src/primitives/tailwind/Accordion/index.tsx b/packages/ui/src/primitives/tailwind/Accordion/index.tsx index cf3c2a547e..d147ab38d5 100644 --- a/packages/ui/src/primitives/tailwind/Accordion/index.tsx +++ b/packages/ui/src/primitives/tailwind/Accordion/index.tsx @@ -23,11 +23,10 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20 Ethereal Engine. All Rights Reserved. */ -import React, { forwardRef, ReactNode, useEffect } from 'react' -import { twMerge } from 'tailwind-merge' +import React, { ReactNode, forwardRef, useEffect } from 'react' import { useHookstate } from '@etherealengine/hyperflux' - +import { twMerge } from 'tailwind-merge' import Text from '../Text' export interface AccordionProps extends React.HTMLAttributes { @@ -38,6 +37,7 @@ export interface AccordionProps extends React.HTMLAttributes { prefixIcon?: ReactNode children?: ReactNode titleClassName?: string + titleFontSize?: 'xs' | 'sm' | 'base' | 'lg' | 'xl' | '2xl' | '3xl' className?: string open?: boolean } @@ -53,6 +53,7 @@ const Accordion = forwardRef( children, className, titleClassName, + titleFontSize = 'xl', open, ...props }: AccordionProps, @@ -76,7 +77,7 @@ const Accordion = forwardRef( >
{prefixIcon &&
{prefixIcon}
} - + {title}
diff --git a/packages/ui/src/primitives/tailwind/Button/index.tsx b/packages/ui/src/primitives/tailwind/Button/index.tsx index 44b42d42d1..9853035a6c 100644 --- a/packages/ui/src/primitives/tailwind/Button/index.tsx +++ b/packages/ui/src/primitives/tailwind/Button/index.tsx @@ -24,6 +24,7 @@ Ethereal Engine. All Rights Reserved. */ import React, { ReactNode } from 'react' + import { twMerge } from 'tailwind-merge' export interface ButtonProps extends React.HTMLAttributes { @@ -31,7 +32,7 @@ export interface ButtonProps extends React.HTMLAttributes { endIcon?: ReactNode children?: ReactNode size?: 'small' | 'medium' | 'large' - variant?: 'primary' | 'outline' | 'danger' | 'success' | 'pink' | 'transparent' | 'onboarding' + variant?: 'primary' | 'outline' | 'danger' | 'success' | 'pink' | 'transparent' | 'onboarding' | 'sidebar' disabled?: boolean fullWidth?: boolean rounded?: 'partial' | 'full' | 'none' @@ -59,7 +60,8 @@ const variants = { danger: 'bg-red-500', success: 'bg-teal-700', transparent: 'bg-transparent', - onboarding: 'bg-button-gradient-onboarding' + onboarding: 'bg-button-gradient-onboarding', + sidebar: 'bg-[#141619]' } const Button = ({