Releasing new design #161

Merged
b merged 241 commits from staging into main 2024-08-21 11:38:25 +00:00
2 changed files with 43 additions and 50 deletions
Showing only changes of commit 804bb6c9ac - Show all commits

View File

@ -1,5 +1,5 @@
import { Box, Button, Container, Link } from '@mui/material'
import { Link as RouterLink } from 'react-router-dom'
import { Box, Button, Container, Link as LinkMui } from '@mui/material'
import { Link } from 'react-router-dom'
import styles from './style.module.scss'
export const Footer = () => (
@ -24,19 +24,19 @@ export const Footer = () => (
}}
gap={'50px'}
>
<Link
<LinkMui
sx={{
justifySelf: {
xs: 'center',
md: 'start'
}
}}
component={RouterLink}
component={Link}
to={'/'}
className={styles.logo}
>
<img src="/logo.svg" alt="Logo" />
</Link>
</LinkMui>
<Box
display={'grid'}
sx={{
@ -58,21 +58,15 @@ export const Footer = () => (
component={'nav'}
className={styles.nav}
>
<RouterLink to={'/'}>
<Button variant={'text'} focusRipple={false}>
<Button component={Link} to={'/'} variant={'text'}>
Home
</Button>
</RouterLink>
<RouterLink to={'/#'}>
<Button variant={'text'} focusRipple={false}>
<Button component={Link} to={'/#'} variant={'text'}>
Documentation
</Button>
</RouterLink>
<RouterLink to={'/#'}>
<Button variant={'text'} focusRipple={false}>
<Button component={Link} to={'/#'} variant={'text'}>
Source
</Button>
</RouterLink>
</Box>
<Box
className={styles.links}
@ -83,11 +77,10 @@ export const Footer = () => (
}
}}
>
<Link
<Button
component={LinkMui}
href="https://snort.social/npub1yay8e9sqk94jfgdlkpgeelj2t5ddsj2eu0xwt4kh4xw5ses2rauqnstrdv"
target="_blank"
>
<Button
sx={{
minWidth: '45px',
padding: '10px'
@ -101,15 +94,14 @@ export const Footer = () => (
height="25"
/>
</Button>
</Link>
</Box>
</Box>
</Container>
<div className={`${styles.borderTop} ${styles.credits}`}>
Built by&nbsp;
<Link href="https://nostrdev.com/" target="_blank">
<LinkMui href="https://nostrdev.com/" target="_blank">
Nostr Dev
</Link>{' '}
</LinkMui>{' '}
2024.
</div>
</footer>

View File

@ -45,14 +45,16 @@ export const Modal = () => {
>
<Box className={styles.modal}>
<Typography id="modal-title" variant="h2">
Login
{tabs.find((t) => activeTab === t.to)?.title}
</Typography>
<Box component={'ul'}>
{tabs.map((t) => {
return (
<Link to={t.to} key={t.to}>
<Button
component={Link}
to={t.to}
key={t.to}
variant={
activeTab === t.to || t.to === appPublicRoutes.nostr
? 'contained'
@ -61,7 +63,6 @@ export const Modal = () => {
>
{t.label}
</Button>
</Link>
)
})}
</Box>