From ec8ceeee41f45f52492bf937867e193c6ccd7524 Mon Sep 17 00:00:00 2001
From: Sendou <38327916+Sendouc@users.noreply.github.com>
Date: Fri, 1 May 2020 14:51:27 +0300
Subject: [PATCH] rubik font only

---
 frontend-react/public/index.html                    | 2 +-
 frontend-react/src/components/common/PageHeader.tsx | 2 +-
 frontend-react/src/components/elements/Markdown.tsx | 2 +-
 frontend-react/src/components/root/App.css          | 3 +++
 frontend-react/src/components/root/App.tsx          | 5 ++---
 frontend-react/src/components/root/Logo.tsx         | 4 ++--
 frontend-react/src/components/root/NavItem.tsx      | 1 -
 frontend-react/src/components/team/LogoHeader.tsx   | 8 +-------
 8 files changed, 11 insertions(+), 16 deletions(-)
 create mode 100644 frontend-react/src/components/root/App.css

diff --git a/frontend-react/public/index.html b/frontend-react/public/index.html
index 51969bc21..4099a499d 100644
--- a/frontend-react/public/index.html
+++ b/frontend-react/public/index.html
@@ -8,7 +8,7 @@
     <meta name="description" content="Competitive Splatoon hub" />
     <link rel="apple-touch-icon" href="logo192.png" />
     <link
-      href="https://fonts.googleapis.com/css?family=Montserrat|Pacifico|Rubik&display=swap"
+      href="https://fonts.googleapis.com/css?family=Rubik&display=swap"
       rel="stylesheet"
     />
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
diff --git a/frontend-react/src/components/common/PageHeader.tsx b/frontend-react/src/components/common/PageHeader.tsx
index 4edee28c6..4f643aef2 100644
--- a/frontend-react/src/components/common/PageHeader.tsx
+++ b/frontend-react/src/components/common/PageHeader.tsx
@@ -17,7 +17,7 @@ const PageHeader: React.FC<PageHeaderProps> = ({ title }) => {
         borderLeftWidth="5px"
         pl="5px"
         mb="0.5em"
-        fontFamily="'Rubik', cursive"
+        fontFamily="'Rubik', sans-serif"
         fontWeight="bold"
       >
         {title}
diff --git a/frontend-react/src/components/elements/Markdown.tsx b/frontend-react/src/components/elements/Markdown.tsx
index b36c35792..109a8524a 100644
--- a/frontend-react/src/components/elements/Markdown.tsx
+++ b/frontend-react/src/components/elements/Markdown.tsx
@@ -136,7 +136,7 @@ const Markdown: React.FC<MarkdownProps> = ({ value }) => {
             my={4}
             size="lg"
             {...getCoreProps(props)}
-            fontFamily="'Rubik', cursive"
+            fontFamily="'Rubik', sans-serif"
           >
             {children}
           </Heading>
diff --git a/frontend-react/src/components/root/App.css b/frontend-react/src/components/root/App.css
new file mode 100644
index 000000000..69830e722
--- /dev/null
+++ b/frontend-react/src/components/root/App.css
@@ -0,0 +1,3 @@
+* {
+  font-family: "Rubik", sans-serif;
+}
diff --git a/frontend-react/src/components/root/App.tsx b/frontend-react/src/components/root/App.tsx
index fc1bdefda..4aae5dd72 100644
--- a/frontend-react/src/components/root/App.tsx
+++ b/frontend-react/src/components/root/App.tsx
@@ -1,4 +1,5 @@
-import React from "react"
+import React, { useEffect } from "react"
+import "./App.css"
 import { Box, useColorMode, useTheme as useChakraTheme } from "@chakra-ui/core"
 
 import { MenuBar } from "./MenuBar"
@@ -9,7 +10,6 @@ import { ThemeColor } from "../../types"
 import { MyThemeProvider } from "../../themeContext"
 import { Theme } from "../../types"
 import Footer from "./Footer"
-import { useEffect } from "react"
 
 const App: React.FC = () => {
   const chakraTheme = useChakraTheme()
@@ -63,7 +63,6 @@ const App: React.FC = () => {
         color={theme[colorMode].textColor}
         bg={theme[colorMode].bgColor}
         minH="100vh"
-        fontFamily="'Montserrat', sans-serif"
         pb="20px"
       >
         <SideNav />
diff --git a/frontend-react/src/components/root/Logo.tsx b/frontend-react/src/components/root/Logo.tsx
index 1e9b8ec92..e211bd64f 100644
--- a/frontend-react/src/components/root/Logo.tsx
+++ b/frontend-react/src/components/root/Logo.tsx
@@ -15,7 +15,7 @@ const Logo: React.FC<LogoProps> = ({ mobile = false }) => {
         display="inline-block"
         transform="translateY(-7px)"
         fontSize={mobile ? "25px" : "30px"}
-        fontFamily="'Pacifico', cursive"
+        fontWeight="bold"
         transition="1.1s"
       >
         S
@@ -26,7 +26,7 @@ const Logo: React.FC<LogoProps> = ({ mobile = false }) => {
         display="inline-block"
         transform="translateY(7px)"
         fontSize={mobile ? "25px" : "30px"}
-        fontFamily="'Pacifico', cursive"
+        fontWeight="bold"
         transition="1.1s"
       >
         ink
diff --git a/frontend-react/src/components/root/NavItem.tsx b/frontend-react/src/components/root/NavItem.tsx
index b6cbe62fc..d9166056a 100644
--- a/frontend-react/src/components/root/NavItem.tsx
+++ b/frontend-react/src/components/root/NavItem.tsx
@@ -29,7 +29,6 @@ const NavItem: React.FC<NavItemProps> = ({ to, icon, title }) => {
           px="2"
           py="1"
           transition="all 0.2s"
-          fontFamily="'Rubik', cursive"
           fontSize="1.1em"
           outline="none"
           _focus={{ shadow: "outline" }}
diff --git a/frontend-react/src/components/team/LogoHeader.tsx b/frontend-react/src/components/team/LogoHeader.tsx
index e17075d1c..f702c1db7 100644
--- a/frontend-react/src/components/team/LogoHeader.tsx
+++ b/frontend-react/src/components/team/LogoHeader.tsx
@@ -28,13 +28,7 @@ const LogoHeader: React.FC<LogoHeaderProps> = ({
   return (
     <Box display="flex" flexDirection="column" alignItems="center">
       <UserAvatar name={name} twitterName={twitter_name} size="2xl" />
-      <Box
-        fontFamily="'Pacifico', cursive"
-        fontWeight="light"
-        fontSize="48px"
-        w="100%"
-        textAlign="center"
-      >
+      <Box fontWeight="light" fontSize="48px" w="100%" textAlign="center">
         {name}
       </Box>
       {founded && (