Merge branch 'joey-testing' into 'master'

Redesigned register functions

See merge request !107

website/public/styles/index.css

@@ -4,17 +4,16 @@ a.button {
     color: black;
     cursor: pointer;
     height: 50%;
-    margin: 8px 0;
-    padding: 14px 20px;
-    width: 25%;
+    padding: 8px 20px;
+    width: 50%;
     font-family: Arial;
-    font-size: 16px;
+    font-size: 20px;
 }
 
 /* Body */
 body {
     height: 100%;
-    background-color: #C8CABD;
+    background-color: #FBC02D;
     /*background-image: url(http://play.pokemonshowdown.com/fx/client-bg-shaymin.jpg);
     background-size: cover;
     background-attachment: fixed;*/
@@ -24,31 +23,14 @@ body {
     font-family: Arial, sans-serif;
 }
 
-/* The Close Button */
-.close {
-  /* Position it in the top right corner outside of the modal */
-    color: white;
-    font-size: 100px;
-    font-weight: bold;
-    position: absolute;
-    right: 25px;
-    top: 0;
-}
-
-/* Close button on hover */
-.close:hover,
-.close:focus {
-    color: red;
-    cursor: pointer;
-}
 
 /* inlogform */
 form {
     /*background-color: #a87a87;*/
     border-radius: 12px;
-    height: 70%;
+    height: 75%;
     margin: auto;
-    width: 70%;
+    width: 80%;
     overflow-y:auto;
 }
 
@@ -72,24 +54,20 @@ input[type=text], input[type=password], input[type=email], input[type="date"] {
     border-color: #C8CABD;
     display: inline-block;
     height: 60%;
+    font-size: 16px;
     padding: 8px 20px;
     margin: 4px 0;
-    width: 70%;
+    width: 55%;
 }
-/*
-input[type=text], input[type=password], input[type=email], input[type="date"] {
-    border: 0px;
-    border-bottom: 4px solid lightgray;
-    border-radius: 0px;
-}*/
 
 button[type=submit] {
     background-color: #C8CABD;
-    color: black  ;
+    color: black;
     cursor: pointer;
     font-family: Arial;
-    font-size: 16px;
-    width: 50%;
+    font-size: 22px;
+    height: 30px;
+    width: 120px;
 }
 
 .error {
@@ -106,12 +84,12 @@ label {
     display: inline-block;
     position: relative;
     background-color: #C8CABD;
-    height: 30px;
-    width: 90px;
-    padding: 3px 3px 3px 0px;
+    height: 25px;
+    width: 120px;
+    padding: 3px 3px 3px 3px;
     text-align: center;
-    border-radius: 0px 10px 10px 0px;
-    font-size: 24px;
+    border-radius: 0px 5px 5px 0px;
+    font-size: 22px;
 
 }
 .left-arrow:after {
@@ -121,9 +99,9 @@ label {
     right: 100%;
     top: 0;
     bottom: 0;
-    border-top: 15px solid transparent;
+    border-top: 12px solid transparent;
     border-right: 20px solid #C8CABD;
-    border-bottom: 15px solid transparent;
+    border-bottom: 12px solid transparent;
     border-left: 0px solid transparent;
 }
 
@@ -135,7 +113,7 @@ label {
 
 /* padding voor login_containers */
 .login_containerlogin {
-    padding:25px;
+    padding:16px;
     text-align: center;
 }
 
@@ -163,7 +141,7 @@ label {
     margin: 34px auto;
     overflow-y: auto;
     padding: 20px;
-    width: 50%;
+    width: 45%;
 }
 
 /*.platform {