diff --git a/public/manifest.json b/public/manifest.json index a29389d..db8ad40 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -10,6 +10,6 @@ ], "start_url": ".", "display": "standalone", - "theme_color": "#f50057", + "theme_color": "#303030", "background_color": "#303030" } diff --git a/src/common/WordWrap/WordWrap.tsx b/src/common/WordWrap/WordWrap.tsx new file mode 100644 index 0000000..546184c --- /dev/null +++ b/src/common/WordWrap/WordWrap.tsx @@ -0,0 +1,27 @@ +import React from 'react'; + +import { makeStyles } from '@material-ui/core/styles'; + +interface Props { + children?: React.ReactNode; +} + +function WordWrap({ children }: Props) { + const classes = useStyles(); + return {children}; +} + +const useStyles = makeStyles(() => ({ + wordWrap: { + overflowWrap: 'break-word', + wordWrap: 'break-word', + '-ms-word-break': 'break-all', + wordBreak: 'break-word', + '-ms-hyphens': 'auto', + '-moz-hyphens': 'auto', + '-webkit-hyphens': 'auto', + hyphens: 'auto', + }, +})); + +export default WordWrap; diff --git a/src/features/ServerPage/features/PlayerPage/common/PageLayout/PageLayout.tsx b/src/features/ServerPage/features/PlayerPage/common/PageLayout/PageLayout.tsx index 31b2e2e..cb01052 100644 --- a/src/features/ServerPage/features/PlayerPage/common/PageLayout/PageLayout.tsx +++ b/src/features/ServerPage/features/PlayerPage/common/PageLayout/PageLayout.tsx @@ -12,6 +12,7 @@ import { makeStyles } from '@material-ui/core/styles'; import { Chip, Toolbar, Typography, Tabs, ChipProps } from '@material-ui/core'; import Content from '@common/Content/Content'; +import WordWrap from '@common/WordWrap/WordWrap'; import Link from '@common/Link/Link'; import TabLink from '@common/Link/TabLink'; @@ -42,7 +43,9 @@ function PageLayout({ children }: Props) {
- {player.name} + + {player.name} +
{!player.exists ? ( diff --git a/src/features/ServerPage/features/TribePage/common/PageLayout/PageLayout.tsx b/src/features/ServerPage/features/TribePage/common/PageLayout/PageLayout.tsx index 736782b..3602e1e 100644 --- a/src/features/ServerPage/features/TribePage/common/PageLayout/PageLayout.tsx +++ b/src/features/ServerPage/features/TribePage/common/PageLayout/PageLayout.tsx @@ -10,6 +10,7 @@ import * as NAMESPACES from '@config/namespaces'; import { makeStyles } from '@material-ui/core/styles'; import { Chip, Toolbar, Typography, Tabs, ChipProps } from '@material-ui/core'; +import WordWrap from '@common/WordWrap/WordWrap'; import Content from '@common/Content/Content'; import TabLink from '@common/Link/TabLink'; @@ -39,7 +40,9 @@ function PageLayout({ children }: Props) {
- {tribe.name} + + {tribe.name} +
{tribe.tag}
diff --git a/src/features/ServerPage/features/VillagePage/components/PageLayout/PageLayout.tsx b/src/features/ServerPage/features/VillagePage/components/PageLayout/PageLayout.tsx index e0f487b..a9f0974 100644 --- a/src/features/ServerPage/features/VillagePage/components/PageLayout/PageLayout.tsx +++ b/src/features/ServerPage/features/VillagePage/components/PageLayout/PageLayout.tsx @@ -7,6 +7,7 @@ import { makeStyles } from '@material-ui/core/styles'; import { Toolbar, Typography } from '@material-ui/core'; import Content from '@common/Content/Content'; +import WordWrap from '@common/WordWrap/WordWrap'; import PlayerProfileLink from '@features/ServerPage/common/PlayerProfileLink/PlayerProfileLink'; import background from './backgrounds/bg-1-dark.jpg'; @@ -26,7 +27,7 @@ function PageLayout({ children, village, server, t }: Props) {
- {village.fullName} ( + {village.fullName} ( {t('pageLayout.points', { points: formatNumber('commas', village.points), })} diff --git a/src/theme/createTheme.ts b/src/theme/createTheme.ts index 6c8f44d..e0376c3 100644 --- a/src/theme/createTheme.ts +++ b/src/theme/createTheme.ts @@ -32,7 +32,6 @@ const createTheme = (): Theme => { color: 'default', }, MuiLink: { - // color: 'secondary', underline: 'none', }, },