{!user && (
}
href={`${config.VITE_API_HOST}/login`}
+ sx={{
+ backgroundColor: constants.primarySurfaceColor,
+ "&:hover": {
+ backgroundColor: constants.primarySurfaceColor,
+ },
+ }}
>
{strings.home_login}
diff --git a/src/components/Home/Sponsors.tsx b/src/components/Home/Sponsors.tsx
index 6366234c5f..daca707815 100644
--- a/src/components/Home/Sponsors.tsx
+++ b/src/components/Home/Sponsors.tsx
@@ -2,7 +2,6 @@ import React from "react";
import { Button } from "@mui/material";
import styled from "styled-components";
import config from "../../config";
-
import useStrings from "../../hooks/useStrings.hook";
const StyledDiv = styled.div`
diff --git a/src/components/Home/Styled.tsx b/src/components/Home/Styled.tsx
index 73ffa5f751..3a896c9d20 100644
--- a/src/components/Home/Styled.tsx
+++ b/src/components/Home/Styled.tsx
@@ -16,7 +16,7 @@ export const HeadlineDiv = styled.div`
margin-top: 10%;
text-transform: uppercase;
font-size: 4rem;
- font-family: ${constants.fontFamilySerif};
+ font-family: ${constants.fontFamilyFuturistic};
font-weight: ${constants.fontWeightMedium};
line-height: 1.2;
letter-spacing: 0.02em;
@@ -36,6 +36,7 @@ export const HeadlineDiv = styled.div`
}
`;
export const DescriptionDiv = styled.div`
+ font-family: ${constants.fontFamilyFuturistic};
font-weight: ${constants.fontWeightLight};
margin-bottom: 20px;
text-shadow: #000 0 0 3px;
@@ -61,10 +62,11 @@ export const ButtonContainer = styled.div`
}
`;
export const BottomTextDiv = styled.div`
+ font-family: ${constants.fontFamilyFuturistic};
font-size: ${constants.fontSizeMedium};
- opacity: 0.6;
font-weight: ${constants.fontWeightLight};
text-align: right;
+ opacity: 0.6;
@media only screen and (max-width: 425px) {
text-align: center;
diff --git a/src/components/Home/Why.tsx b/src/components/Home/Why.tsx
index 190cf4b285..eb219ad573 100644
--- a/src/components/Home/Why.tsx
+++ b/src/components/Home/Why.tsx
@@ -37,12 +37,13 @@ const StyledDiv = styled.div`
& .headline {
margin-top: 8px;
- font-family: ${constants.fontFamilySerif};
+ font-family: ${constants.fontFamilyFuturistic};
font-size: 1.25rem;
line-height: 2;
}
& .description {
+ font-family: ${constants.fontFamilyFuturistic};
font-size: 0.875rem;
font-weight: ${constants.fontWeightLight};
line-height: 1.5;
diff --git a/src/components/Match/Laning/Graph.tsx b/src/components/Match/Laning/Graph.tsx
index 6aba5cb35e..40e2a84b8a 100644
--- a/src/components/Match/Laning/Graph.tsx
+++ b/src/components/Match/Laning/Graph.tsx
@@ -21,6 +21,7 @@ import {
import useStrings from "../../../hooks/useStrings.hook";
import { Spacer } from "../../Spacer/Spacer";
import constants from "../../constants";
+import Grid from "../../Visualizations/Graph/Grid";
const formatGraphTime = (minutes: number) => `${minutes}:00`;
@@ -149,13 +150,7 @@ const Graph = (props: GraphProps) => {
axisLine={false}
tickLine={false}
/>
-
-
+
} />
{match.players.map((player) => {
const hero = heroes[player.hero_id] || {};
diff --git a/src/components/Match/MatchHeader/MatchHeader.tsx b/src/components/Match/MatchHeader/MatchHeader.tsx
index 8071bef646..34f1ae1562 100644
--- a/src/components/Match/MatchHeader/MatchHeader.tsx
+++ b/src/components/Match/MatchHeader/MatchHeader.tsx
@@ -51,7 +51,7 @@ const Styled = styled.header`
background: rgba(0, 0, 0, 23%);
font-size: 1.5rem;
font-weight: 400;
- font-family: ${constants.fontFamilySerif};
+ font-family: ${constants.fontFamilyFuturistic};
letter-spacing: 1px;
@media only screen and (max-width: 1023px) {
@@ -125,7 +125,7 @@ const Styled = styled.header`
}
& .gameMode {
- font-family: ${constants.fontFamilySerif};
+ font-family: ${constants.fontFamilyFuturistic};
font-size: ${constants.fontSizeSmall};
letter-spacing: 0.02rem;
margin-top: -16px;
@@ -141,7 +141,8 @@ const Styled = styled.header`
}
& .ended {
- font-size: ${constants.fontSizeSmall};
+ font-family: ${constants.fontFamilyFuturistic};
+ font-size: ${constants.fontSizeTiny};
color: ${constants.colorMutedLight};
margin-top: 6px;
@@ -152,7 +153,7 @@ const Styled = styled.header`
}
.killScore {
- font-family: ${constants.fontFamilySerif};
+ font-family: ${constants.fontFamilyFuturistic};
font-size: 2.5rem;
text-align: center;
@@ -181,10 +182,6 @@ const Styled = styled.header`
@media only screen and (max-width: 1023px) {
text-align: center;
-
- & span {
- margin-bottom: 5px;
- }
}
& ul {
@@ -205,6 +202,7 @@ const Styled = styled.header`
.infoKey {
display: block;
text-transform: uppercase;
+ font-family: ${constants.fontFamilyFuturistic};
font-size: ${constants.fontSizeSmall};
color: ${constants.colorMutedLight};
}
@@ -212,7 +210,7 @@ const Styled = styled.header`
.infoValue {
margin-top: 8px;
display: block;
- font-family: ${constants.fontFamilySerif};
+ font-family: ${constants.fontFamilyFuturistic};
font-size: ${constants.fontSizeSmall};
color: ${constants.colorWhite};
}
diff --git a/src/components/Player/Header/PlayerButtons.tsx b/src/components/Player/Header/PlayerButtons.tsx
index 6ba1414616..d27558be98 100644
--- a/src/components/Player/Header/PlayerButtons.tsx
+++ b/src/components/Player/Header/PlayerButtons.tsx
@@ -7,10 +7,12 @@ import styled from "styled-components";
import { toggleShowForm as toggleShowFormAction } from "../../../actions/formActions";
import GamemodeToggle from "../../GamemodeToggle/GamemodeToggle";
import config from "../../../config";
+import constants from "../../constants";
const Styled = styled.div`
display: flex;
flex-direction: row;
+ align-items: center;
flex-wrap: nowrap;
font-size: 14px;
@@ -52,7 +54,7 @@ class PlayerButtons extends React.Component<
}
+ startIcon={
}
disabled={this.state.disableRefresh}
onClick={() => {
fetch(`${config.VITE_API_HOST}/api/players/${playerId}/refresh`, {
diff --git a/src/components/Player/Header/PlayerHeader.tsx b/src/components/Player/Header/PlayerHeader.tsx
index b1cc233c3f..38217f12b2 100644
--- a/src/components/Player/Header/PlayerHeader.tsx
+++ b/src/components/Player/Header/PlayerHeader.tsx
@@ -31,12 +31,14 @@ const Styled = styled.div`
}
.playerName {
+ font-family: ${constants.fontFamilyFuturistic};
color: rgba(245, 245, 245, 0.870588);
font-size: 28px;
text-align: center;
}
.titleNameButtons {
+ margin-left: 8px;
display: flex;
flex-direction: row;
justify-content: flex-start;
@@ -302,7 +304,9 @@ const PlayerHeader = ({
loggedInId={loggedInUser && String(loggedInUser.account_id)}
compact={!small}
/>
-
+
diff --git a/src/components/Player/Header/Styled.tsx b/src/components/Player/Header/Styled.tsx
index 9e21674e9f..bd8eae1d39 100644
--- a/src/components/Player/Header/Styled.tsx
+++ b/src/components/Player/Header/Styled.tsx
@@ -1,15 +1,18 @@
import { CardHeader } from "@mui/material";
import styled from "styled-components";
+import constants from "../../constants";
export const PlayerStatsCard = styled(CardHeader)`
& span:last-child {
+ font-family: ${constants.fontFamilyFuturistic};
font-size: 24px !important;
color: rgba(255, 255, 255, 0.87) !important;
line-height: 36px !important;
}
& span:first-child {
- font-size: 14px !important;
+ font-family: ${constants.fontFamilyFuturistic};
+ font-size: ${constants.fontSizeSmall};
color: rgba(255, 255, 255, 0.54) !important;
line-height: 1 !important;
text-transform: uppercase;
diff --git a/src/components/Player/Pages/Histograms/Histograms.tsx b/src/components/Player/Pages/Histograms/Histograms.tsx
index 20c413931f..5e5a8ac84d 100644
--- a/src/components/Player/Pages/Histograms/Histograms.tsx
+++ b/src/components/Player/Pages/Histograms/Histograms.tsx
@@ -1,7 +1,6 @@
import React from "react";
import { connect } from "react-redux";
import { withRouter } from "react-router-dom";
-
import { getPlayerHistograms } from "../../../../actions";
import ButtonGarden from "../../../ButtonGarden/ButtonGarden";
import Container from "../../../Container/Container";
@@ -10,6 +9,7 @@ import { HistogramGraph } from "../../../Visualizations";
import dataColumns from "../matchDataColumns";
import { formatGraphValueData } from "../../../../utility";
import useStrings from "../../../../hooks/useStrings.hook";
+import { Spacer } from "../../../Spacer/Spacer";
const getMedian = (columns: any[], midpoint: number) => {
let sum = 0;
@@ -46,6 +46,9 @@ const Histogram = ({
history,
}: HistogramsProps) => {
const strings = useStrings();
+ const match = window.location.pathname.match(/\/histograms\/([^/?]+)/);
+ const buttonKey = match?.[1];
+ const buttonName = strings[`heading_${buttonKey}` as keyof Strings];
return (
diff --git a/src/components/Request/Request.tsx b/src/components/Request/Request.tsx
index 060de5abfd..49e2d68e7f 100644
--- a/src/components/Request/Request.tsx
+++ b/src/components/Request/Request.tsx
@@ -6,6 +6,8 @@ import Heading from "../Heading/Heading";
import { LazyLog, ScrollFollow } from "@melloware/react-logviewer";
import useStrings from "../../hooks/useStrings.hook";
import config from "../../config";
+import constants from "../constants";
+import { Spacer } from "../Spacer/Spacer";
const Request = () => {
const strings = useStrings();
@@ -51,6 +53,7 @@ const Request = () => {