Skip to content

Commit

Permalink
Merge pull request #5236 from marmelab/fix-welcome-banner
Browse files Browse the repository at this point in the history
Fix the welcome banner style of the demo
  • Loading branch information
jdemangeon authored Sep 14, 2020
2 parents 3f99a98 + 82c828f commit c99bbab
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions examples/demo/src/dashboard/Welcome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import CodeIcon from '@material-ui/icons/Code';
import { makeStyles } from '@material-ui/core/styles';
import { useTranslate } from 'react-admin';

import backgroundImage from './welcome_bg.png';
import publishArticleImage from './welcome_illustration.svg';

const useStyles = makeStyles(theme => ({
root: {
background:
theme.palette.type === 'dark'
? '#535353'
: `url(${backgroundImage}) no-repeat #6f4ceb`,
: `linear-gradient(to right, #8975fb 0%, #746be7 35%), linear-gradient(to bottom, #8975fb 0%, #6f4ceb 50%), #6f4ceb`,

color: '#fff',
padding: 20,
marginTop: theme.spacing(2),
Expand Down Expand Up @@ -58,7 +58,7 @@ const Welcome: FC = () => {
href="https://marmelab.com/react-admin"
startIcon={<HomeIcon />}
>
{translate('pos.dashboard.welcome.aor_button')}
{translate('pos.dashboard.welcome.ra_button')}
</Button>
<Button
variant="contained"
Expand All @@ -72,11 +72,11 @@ const Welcome: FC = () => {

<Box
display={{ xs: 'none', sm: 'none', md: 'block' }}
width="15em"
className={classes.media}
width="16em"
height="9em"
overflow="hidden"
>
<Box height="9em" width="15em" className={classes.media} />
</Box>
/>
</Box>
</Card>
);
Expand Down
Binary file removed examples/demo/src/dashboard/welcome_bg.png
Binary file not shown.
2 changes: 1 addition & 1 deletion examples/demo/src/i18n/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const customEnglishMessages: TranslationMessages = {
title: 'Welcome to the react-admin e-commerce demo',
subtitle:
"This is the admin of an imaginary poster shop. Feel free to explore and modify the data - it's local to your computer, and will reset each time you reload.",
aor_button: 'react-admin site',
ra_button: 'react-admin site',
demo_button: 'Source for this demo',
},
},
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/src/i18n/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const customFrenchMessages: TranslationMessages = {
title: 'Bienvenue sur la démo e-commerce de react-admin',
subtitle:
"Ceci est le back-office d'un magasin de posters imaginaire. N'hésitez pas à explorer et à modifier les données. La démo s'exécute en local dans votre navigateur, et se remet à zéro chaque fois que vous rechargez la page.",
aor_button: 'Site web de react-admin',
ra_button: 'Site web de react-admin',
demo_button: 'Code source de cette démo',
},
},
Expand Down

0 comments on commit c99bbab

Please # to comment.