Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix the welcome banner style of the demo #5236

Merged
merged 3 commits into from
Sep 14, 2020
Merged

Fix the welcome banner style of the demo #5236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30de6f0
Change the background from an image to a linear gradient in the Welco…
Luwangel Sep 8, 2020
d661922
Fix the cropped image inside the Welcome banner
Luwangel Sep 8, 2020
82c828f
Change an old admin on rest translation key in the Welcome banner
Luwangel Sep 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions examples/demo/src/dashboard/Welcome.tsx
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion examples/demo/src/i18n/en.ts
View file
Open in desktop
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
View file
Open in desktop
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