Skip to content

Commit

Permalink
sc-9903 Add new GDS logo to Nav Menu
Browse files Browse the repository at this point in the history
  • Loading branch information
elysee15 committed Oct 12, 2022
1 parent 0d7b7f9 commit 0a7f0ed
Show file tree
Hide file tree
Showing 7 changed files with 988 additions and 12 deletions.
Binary file added web/gds-user-ui/src/assets/TRISA-GDS-black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
485 changes: 485 additions & 0 deletions web/gds-user-ui/src/assets/TRISA-GDS-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/gds-user-ui/src/assets/TRISA-GDS-white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
493 changes: 493 additions & 0 deletions web/gds-user-ui/src/assets/TRISA-GDS.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions web/gds-user-ui/src/components/Header/LandingHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ const LandingHeader = (props: FlexProps): JSX.Element => {
<Flex
width="100%"
position={'relative'}
p={{ base: 4, md: 8 }}
bg={'transparent'}
boxShadow="md"
color={colors.system.blue}
Expand All @@ -49,7 +48,7 @@ const LandingHeader = (props: FlexProps): JSX.Element => {
<Box>
<NavLink to={'/'}>
<Link _active={{ outline: 'none' }} _focus={{ outline: 'none' }}>
<Logo w={{ base: '50px', md: '100px' }} color={['colors.system.blue']} />
<Logo w={{ base: '50px', md: '120px' }} color={['colors.system.blue']} />
</Link>
</NavLink>
</Box>
Expand Down
15 changes: 7 additions & 8 deletions web/gds-user-ui/src/components/Sidebar/SidebarContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ import {
Divider,
VStack,
Stack,
Heading,
Link,
Icon,
Text,
Collapse,
List
} from '@chakra-ui/react';
import trisaLogo from '../../assets/trisa.svg';
import trisaLogo from 'assets/TRISA-GDS.svg';
import NavItem, { StyledNavItem } from './NavItem';
import MenuItems from '../../utils/menu';
import { MdContactSupport } from 'react-icons/md';
import { IoLogoSlack } from 'react-icons/io';
import { Fragment, useState } from 'react';
import { Trans } from '@lingui/react';
import { LazyLoadImage } from 'react-lazy-load-image-component';
import ChakraRouterLink from 'components/ChakraRouterLink';

interface SidebarProps extends BoxProps {
onClose: () => void;
Expand All @@ -40,12 +40,11 @@ const SidebarContent = ({ onClose, ...rest }: SidebarProps) => {
h="full"
{...rest}>
<Flex h="20" alignItems="center" mx="8" my={2} justifyContent="space-between">
<Stack width="100%" direction={['row']}>
<LazyLoadImage src={trisaLogo} alt="GDS UI" />
<Heading size="sm" color="#FFFFFF" lineHeight={1.35}>
<Trans id="Global Directory Service">Global Directory Service</Trans>
</Heading>
</Stack>
<ChakraRouterLink to="/dashboard/overview">
<Stack width="100%" direction={['row']} height="200px">
<LazyLoadImage src={trisaLogo} alt="GDS UI" />
</Stack>
</ChakraRouterLink>
<CloseButton display={{ base: 'flex', md: 'none' }} onClick={onClose} />
</Flex>
<VStack alignItems="flex-start" justifyContent="center" spacing={0}>
Expand Down
4 changes: 2 additions & 2 deletions web/gds-user-ui/src/components/ui/Logo.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Box, BoxProps } from '@chakra-ui/react';
import TrisaLogo from 'assets/trisa_logo.svg';
import CkLazyLoadImage from 'components/LazyImage';
import { Link } from 'react-router-dom';
import TrisaLogo from 'assets/TRISA-GDS-black.png';

export default function Logo(props: BoxProps) {
return (
<Box {...props}>
<Link to="/">
<CkLazyLoadImage src={TrisaLogo} alt="Trisa logo" width="100px" height="50px" />
<CkLazyLoadImage src={TrisaLogo} alt="Trisa logo" />
</Link>
</Box>
);
Expand Down

0 comments on commit 0a7f0ed

Please sign in to comment.