diff --git a/src/atoms/04_Logo/Logo.tsx b/src/atoms/04_Logo/Logo.tsx index 6651e0a..c7d3db6 100644 --- a/src/atoms/04_Logo/Logo.tsx +++ b/src/atoms/04_Logo/Logo.tsx @@ -1,4 +1,4 @@ -/* eslint no-unused-vars:0, no-shadow:0, @typescript-eslint/no-explicit-any:0 */ +/* eslint no-underscore-dangle:0, max-len:0, no-unused-vars:0, no-shadow:0, @typescript-eslint/no-explicit-any:0 */ // @atoms/Button.tsx import clsx from 'clsx'; import MLink from '@mui/material/Link'; @@ -8,6 +8,7 @@ export enum ELogoSize { SMALL = 'small', MEDIUM = 'medium', LARGE = 'large', + RESPONSIVE = 'responsive', } export interface ILogo { @@ -28,24 +29,59 @@ export const HLogo = function ({ ]; const styles = clsx(sx); - const sizeMap = { + const _sizeMap = { [ELogoSize.LARGE]: { width: 180, - height: 'auto', + desktop: 180, }, [ELogoSize.MEDIUM]: { width: 120, - height: 'auto', + desktop: 120, }, [ELogoSize.SMALL]: { width: 80, - height: 'auto', + desktop: 80, + }, + [ELogoSize.RESPONSIVE]: { + width: 80, + desktop: 120, }, }; + const sizeMap = + size === ELogoSize.RESPONSIVE + ? { + [ELogoSize.LARGE]: { + width: 80, + desktop: 120, + }, + [ELogoSize.MEDIUM]: { + width: 80, + desktop: 120, + }, + [ELogoSize.SMALL]: { + width: 80, + desktop: 120, + }, + [ELogoSize.RESPONSIVE]: { + width: 80, + desktop: 120, + }, + } + : _sizeMap; + return ( - - + + + ); }; diff --git a/src/atoms/04_Logo/assets/components/Logo.tsx b/src/atoms/04_Logo/assets/components/Logo.tsx index e1678df..c80cbd4 100644 --- a/src/atoms/04_Logo/assets/components/Logo.tsx +++ b/src/atoms/04_Logo/assets/components/Logo.tsx @@ -5,25 +5,13 @@ import React from 'react'; interface LogoProps { color?: string; - width?: number | string; - height?: number | string; } type TComponent = React.FC>; -const Logo: TComponent = function ({ - color = 'black', - width = 24, - height = 24, - ...props -}: LogoProps) { +const Logo: TComponent = function ({ color = 'black', ...props }: LogoProps) { return ( - + ) : undefined} - +
{!hideMenu ? ( @@ -737,12 +733,8 @@ export const HNav = function ({ ) : undefined}
-
- - - - - +
+
{!hideControls ? (