Improve font support, fix svg inline #123

Merged
enes merged 5 commits from issue-fonts-support into staging 2024-08-02 09:52:14 +00:00
7 changed files with 29 additions and 5 deletions
Showing only changes of commit 0a74ad97b2 - Show all commits

View File

@ -137,7 +137,7 @@ export const AppBar = () => {
<Button <Button
startIcon={<ButtonIcon />} startIcon={<ButtonIcon />}
onClick={() => { onClick={() => {
navigate(appPublicRoutes.login) navigate(appPublicRoutes.nostr)
}} }}
variant="contained" variant="contained"
> >

View File

@ -93,6 +93,10 @@ export const Modal = () => {
) )
})} })}
</ul> </ul>
{activeTab === appPublicRoutes.login ||
activeTab === appPublicRoutes.register ? (
<div className={styles.comingSoon}>Coming soon!</div>
) : null}
<div className={styles.tabContent}> <div className={styles.tabContent}>
<Outlet /> <Outlet />
</div> </div>

View File

@ -66,6 +66,14 @@ $default-modal-padding: 15px 25px;
padding-inline: 10px; padding-inline: 10px;
} }
.comingSoon {
padding: 15px;
color: rgba(0, 0, 0, 0.5);
text-align: center;
font-weight: 400;
font-size: 16px;
}
.footer { .footer {
padding: 15px; padding: 15px;
border-top: solid 1px rgba(0, 0, 0, 0.1); border-top: solid 1px rgba(0, 0, 0, 0.1);

View File

@ -25,7 +25,7 @@ export const LandingPage = () => {
const location = useLocation() const location = useLocation()
const onSignInClick = async () => { const onSignInClick = async () => {
navigate(appPublicRoutes.login) navigate(appPublicRoutes.nostr)
} }
const cards = [ const cards = [

View File

@ -1,6 +1,8 @@
import { Button, TextField } from '@mui/material' import { Button, TextField } from '@mui/material'
export const Login = () => { export const Login = () => {
// TODO: All fields, buttons are disabled
// Feature not implemented
return ( return (
<> <>
<TextField <TextField
@ -9,6 +11,7 @@ export const Login = () => {
fullWidth fullWidth
margin="dense" margin="dense"
autoComplete="username" autoComplete="username"
disabled
/> />
<TextField <TextField
label="Password" label="Password"
@ -16,9 +19,10 @@ export const Login = () => {
fullWidth fullWidth
margin="dense" margin="dense"
autoComplete="current-password" autoComplete="current-password"
disabled
/> />
<Button variant="contained" fullWidth> <Button variant="contained" fullWidth disabled>
Login Login
</Button> </Button>
</> </>

View File

@ -1,6 +1,8 @@
import { Button, TextField } from '@mui/material' import { Button, TextField } from '@mui/material'
export const Register = () => { export const Register = () => {
// TODO: All fields, buttons are disabled
// Feature not implemented
return ( return (
<> <>
<TextField <TextField
@ -9,6 +11,7 @@ export const Register = () => {
fullWidth fullWidth
margin="dense" margin="dense"
autoComplete="username" autoComplete="username"
disabled
/> />
<TextField <TextField
label="Password" label="Password"
@ -17,6 +20,7 @@ export const Register = () => {
margin="dense" margin="dense"
type="password" type="password"
autoComplete="new-password" autoComplete="new-password"
disabled
/> />
<TextField <TextField
label="Confirm password" label="Confirm password"
@ -25,9 +29,10 @@ export const Register = () => {
margin="dense" margin="dense"
type="password" type="password"
autoComplete="new-password" autoComplete="new-password"
disabled
/> />
<Button variant="contained" fullWidth> <Button variant="contained" fullWidth disabled>
Register Register
</Button> </Button>
</> </>

View File

@ -55,7 +55,10 @@ export const theme = extendTheme({
}, },
contained: { contained: {
background: 'var(--primary-main)', background: 'var(--primary-main)',
color: 'white',
':hover': {
color: 'white' color: 'white'
}
}, },
outlined: { outlined: {
':hover': { ':hover': {