Skip to content

Commit

Permalink
Merge pull request #122 from radicalxdev/update/logo
Browse files Browse the repository at this point in the history
updated marvel logo
  • Loading branch information
bkb-Git authored Aug 20, 2024
2 parents a2a4a75 + 49325ef commit f007233
Show file tree
Hide file tree
Showing 3 changed files with 136 additions and 10 deletions.
129 changes: 129 additions & 0 deletions frontend/assets/svg/MarvelAIFrame.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 3 additions & 9 deletions frontend/layouts/MainAppLayout/SideMenu/SideMenu.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { LogoutOutlined } from '@mui/icons-material';
import { Button, Grid, Typography } from '@mui/material';
import { Button, Grid } from '@mui/material';

import { signOut } from 'firebase/auth';
import { useRouter } from 'next/router';

import LargeLogo from '@/assets/svg/MenuLogo.svg';
import MarvelAILogo from '@/assets/svg/MarvelAIFrame.svg';

import ROUTES from '@/constants/routes';

Expand All @@ -30,13 +30,7 @@ const SideMenu = () => {
return (
<Grid onClick={() => router.push(ROUTES.HOME)} {...styles.logoGridProps}>
<Grid {...styles.logoImageGridProps}>
<LargeLogo />
</Grid>
<Grid {...styles.titleGridProps}>
<Typography {...styles.titleProps}>Marvel.AI</Typography>
<Typography {...styles.subtitleProps}>
AI Teaching Assistant
</Typography>
<MarvelAILogo />
</Grid>
</Grid>
);
Expand Down
5 changes: 4 additions & 1 deletion frontend/layouts/MainAppLayout/SideMenu/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,19 @@ const styles = {
logoImageGridProps: {
container: true,
item: true,
mobileSmall: 'auto',
mobileSmall: 12,
height: 'auto',
},
titleGridProps: {
position: 'relative',
container: true,
item: true,
mobileSmall: true,
flexDirection: 'column',
justifyContent: 'flex-start',
alignItems: 'center',
height: '60px',
width: '100%',
},
titleProps: {
fontFamily: 'Ethnocentric Regular',
Expand Down

0 comments on commit f007233

Please sign in to comment.