Merge remote-tracking branch 'origin/main' into add-cross-env

# Conflicts:
#	yarn.lock

2 files changed, 4 insertions, 4 deletions

diff --git a/src/App.tsx b/src/App.tsx
index a1c628e..2a8fd31 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -9,7 +9,7 @@ import {
   Switch
 } from "react-router-dom";
 
-import { HashLoader } from "react-spinners";
+import { RingLoader } from "react-spinners";
 
 import { CSSTransition, TransitionGroup } from "react-transition-group";
 
@@ -31,7 +31,7 @@ function PageLoading() {
     justify-content: center;
     margin-top: 50px;
   `}>
-    <HashLoader color="white" size={100}/>
+    <RingLoader color="white" size={100}/>
   </div>
 }
 
diff --git a/src/components/Loading.tsx b/src/components/Loading.tsx
index 2758225..5083214 100644
--- a/src/components/Loading.tsx
+++ b/src/components/Loading.tsx
@@ -1,7 +1,7 @@
 /** @jsx jsx */
 import { jsx } from "@emotion/react";
 
-import { HashLoader } from "react-spinners";
+import { RingLoader } from "react-spinners";
 
 import HeaderBar from "../components/HeaderBar";
 
@@ -9,7 +9,7 @@ function Loading() {
     return <div>
         <HeaderBar title={"Loading..."}/>
         <div css={{display: "flex", justifyContent: "center"}}>
-            <HashLoader color="white"/>
+            <RingLoader color="white"/>
         </div>
     </div>
 }