diff --git a/packages/webapp/public/favicon.ico b/packages/webapp/public/favicon.ico index cf412512..f6952bc3 100644 Binary files a/packages/webapp/public/favicon.ico and b/packages/webapp/public/favicon.ico differ diff --git a/packages/webapp/public/favicon.png b/packages/webapp/public/favicon.png index 48fbc476..bb62808d 100644 Binary files a/packages/webapp/public/favicon.png and b/packages/webapp/public/favicon.png differ diff --git a/packages/webapp/public/manifest.json b/packages/webapp/public/manifest.json index 46e82a49..8552adfe 100644 --- a/packages/webapp/public/manifest.json +++ b/packages/webapp/public/manifest.json @@ -3,13 +3,13 @@ "name": "WiseMapping", "icons": [{ "src": "favicon.ico", - "sizes": "64x64 32x32 24x24 16x16", + "sizes": "256x256 192x192 128x128 96x96 64x64 32x32 24x24 16x16", "type": "image/x-icon" }, { "src": "favicon.png", "type": "image/png", - "sizes": "512x512" + "sizes": "1024x1024" } ], "start_url": ".", diff --git a/packages/webapp/src/components/layout/footer/index.tsx b/packages/webapp/src/components/layout/footer/index.tsx index 743bb75d..97518d61 100644 --- a/packages/webapp/src/components/layout/footer/index.tsx +++ b/packages/webapp/src/components/layout/footer/index.tsx @@ -2,14 +2,14 @@ import React from 'react' import { FormattedMessage } from 'react-intl' import { StyledFooter } from './styled' -const logo = require('../../../images/logo-text.svg') +const poweredByIcon = require('../../../images/pwrdby-white.svg') const Footer = () => { return (
-
Powered By
logo + Powered By WiseMapping
diff --git a/packages/webapp/src/components/maps-page/index.tsx b/packages/webapp/src/components/maps-page/index.tsx index 1bfdeab9..56095158 100644 --- a/packages/webapp/src/components/maps-page/index.tsx +++ b/packages/webapp/src/components/maps-page/index.tsx @@ -8,12 +8,13 @@ import IconButton from '@material-ui/core/IconButton'; import ListItem from '@material-ui/core/ListItem'; import ListItemIcon from '@material-ui/core/ListItemIcon'; import { ListItemTextStyled, useStyles } from './style'; -import { AccountCircle, AddCircleTwoTone, BlurCircular, CloudUploadTwoTone, DeleteOutlineTwoTone, Help, LabelTwoTone, PublicTwoTone, ShareTwoTone, StarRateTwoTone, Translate, TranslateTwoTone } from '@material-ui/icons'; +import { AccountCircle, AddCircleTwoTone, BlurCircular, CloudUploadTwoTone, DeleteOutlineTwoTone, Help, LabelTwoTone, PublicTwoTone, ShareTwoTone, StarRateTwoTone, Translate, TranslateTwoTone } from '@material-ui/icons'; import InboxTwoToneIcon from '@material-ui/icons/InboxTwoTone'; -import { Button, ListItemSecondaryAction, Menu, MenuItem, Tooltip } from '@material-ui/core'; -import { MapsList } from './maps-list'; +import { Button, Link, ListItemSecondaryAction, Menu, MenuItem, Tooltip } from '@material-ui/core'; +import { MapsList } from './maps-list'; import { FormattedMessage } from 'react-intl'; const logo = require('../../images/logo-small.svg') +const poweredByIcon = require('../../images/pwrdby-white.svg') type FilterType = 'public' | 'all' | 'starred' | 'shared' | 'label' | 'owned' @@ -82,12 +83,11 @@ const MapsPage = (props: any) => { }), }}> -
- logo +
+ logo
- @@ -134,8 +134,12 @@ const MapsPage = (props: any) => { - +
+ + Powered By WiseMapping + +
diff --git a/packages/webapp/src/components/maps-page/maps-list/index.tsx b/packages/webapp/src/components/maps-page/maps-list/index.tsx index 60c6fca3..b2041753 100644 --- a/packages/webapp/src/components/maps-page/maps-list/index.tsx +++ b/packages/webapp/src/components/maps-page/maps-list/index.tsx @@ -302,7 +302,6 @@ export const MapsList = () => { diff --git a/packages/webapp/src/components/maps-page/maps-list/styled.ts b/packages/webapp/src/components/maps-page/maps-list/styled.ts index 740143ef..9e0bf76b 100644 --- a/packages/webapp/src/components/maps-page/maps-list/styled.ts +++ b/packages/webapp/src/components/maps-page/maps-list/styled.ts @@ -57,7 +57,7 @@ export const useStyles = makeStyles((theme: Theme) => '&:hover': { backgroundColor: fade(theme.palette.common.white, 0.25), }, - marginLeft: 0, + margin: '10px 0px', width: '100%', [theme.breakpoints.up('sm')]: { marginLeft: theme.spacing(1), @@ -66,7 +66,7 @@ export const useStyles = makeStyles((theme: Theme) => float: 'right' }, searchIcon: { - padding: '5px 0 0 8px', + padding: '5px 0 0 5px', height: '100%', position: 'absolute', pointerEvents: 'none', diff --git a/packages/webapp/src/favicon.png b/packages/webapp/src/favicon.png deleted file mode 100644 index 48fbc476..00000000 Binary files a/packages/webapp/src/favicon.png and /dev/null differ diff --git a/packages/webapp/src/images/logo-icon.png b/packages/webapp/src/images/logo-icon.png new file mode 100644 index 00000000..bb62808d Binary files /dev/null and b/packages/webapp/src/images/logo-icon.png differ diff --git a/packages/webapp/src/images/logo-icon.svg b/packages/webapp/src/images/logo-icon.svg index 0d663cc0..11f96dd4 100644 --- a/packages/webapp/src/images/logo-icon.svg +++ b/packages/webapp/src/images/logo-icon.svg @@ -1,5 +1,5 @@ - + diff --git a/packages/webapp/src/images/pwrdby-black.svg b/packages/webapp/src/images/pwrdby-black.svg new file mode 100644 index 00000000..147483f4 --- /dev/null +++ b/packages/webapp/src/images/pwrdby-black.svg @@ -0,0 +1,11 @@ + + + + + + + + Powered by + + + \ No newline at end of file diff --git a/packages/webapp/src/images/pwrdby-white.svg b/packages/webapp/src/images/pwrdby-white.svg new file mode 100644 index 00000000..d99261da --- /dev/null +++ b/packages/webapp/src/images/pwrdby-white.svg @@ -0,0 +1,11 @@ + + + + + + + + Powered by + + + \ No newline at end of file