Bundled fonts together

public/index.html

@@ -5,10 +5,6 @@
     <link rel="manifest" href="manifest.json" />
     <link rel="shortcut icon" href="logo.png" />
     <link rel="stylesheet" href="styles.css" />
-    <link
-      href="https://fonts.googleapis.com/css?family=Martel:300,400&display=swap"
-      rel="stylesheet"
-    />
 
     <link
       rel="stylesheet"
@@ -168,9 +164,11 @@
             </svg>
             <div id="others">
               <div id="other-palette">
-                Others
+                <b>Others</b>
               </div>
-              <input id="other-colours" type="color" value="black" />
+              <label id="colours">
+                <input id="other-colours" type="color" value="blue" />
+              </label>
             </div>
           </div>
         </div>

public/styles.css

@@ -183,7 +183,7 @@ button.selected {
   box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.1);
   animation-name: animatetop;
   animation-duration: 0.4s;
-  font-family: "Martel", serif;
+  font-family: "Martel", sans-serif;
 }
 
 .close {
@@ -238,7 +238,7 @@ button.selected {
   width: 500px;
   height: 500px;
   box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.1);
-  font-family: "Martel", serif;
+  font-family: "Martel", sans-serif;
 }
 
 .wheelPiece {
@@ -257,8 +257,55 @@ button.selected {
 }
 
 #others {
-  padding-top: 2%;
+  margin-top: 2%;
   display: flex;
   align-items: center;
   padding-left: 40%;
+  background-color: #3cbc8d;
+  color: white;
+  padding-top: 4px;
+  padding-bottom: 4px;
+}
+
+#other-colours {
+  background-color: #3cbc8d;
+}
+
+#colours {
+  background-color: blue;
+  height: 32px;
+  width: 64px;
+  border: 4px solid #555;
+  border-radius: 4px;
+  opacity: 0.5;
+  margin-left: 2%;
+}
+
+#colours:hover {
+  border: 4px solid #4f4f4f;
+  border-radius: 4px;
+  opacity: 1;
+  transition-duration: 0.4s;
+}
+
+#other-colours {
+  visibility: hidden;
+}
+
+@font-face {
+  font-family: "Martel";
+  font-style: normal;
+  font-weight: 400;
+  src: url("./assets/fonts/martel-v4-latin/martel-v4-latin-regular.eot");
+  src: local("Martel"), local("Martel-Regular"),
+    url("./assets/fonts/martel-v4-latin/martel-v4-latin-regular.eot?#iefix")
+      format("embedded-opentype"),
+    url("./assets/fonts/martel-v4-latin/martel-v4-latin-regular.woff2")
+      format("woff2"),
+    url("./assets/fonts/martel-v4-latin/martel-v4-latin-regular.woff")
+      format("woff"),
+    url("./assets/fonts/martel-v4-latin/martel-v4-latin-regular.ttf")
+      format("truetype"),
+    url("./assets/fonts/martel-v4-latin/martel-v4-latin-regular.svg#Martel")
+      format("svg");
 }