Merge branch 'marijn-settings' into 'master'

Marijn settings

See merge request !27

website/styles/main.css

@@ -118,16 +118,31 @@ a, a:link, a:visited, a:hover, a:active {
 button, input, select {
     width: auto;
     height: 32px;
-    padding: 0 5px;
-
-    background: white;
-    color: #3333333;
 
     cursor: pointer;
     border: none;
 
-    font-family: Arial;
+    font-family: Arial, sans-serif;
     font-size: 16px;
+    border-radius: 7px;
+}
+
+textarea, input, select {
+    padding: 0 5px;
+    background: white;
+    color: #333333;
+    border: 1px solid #845663;
+    border-radius: 7px;
+    font-size: 16px;
+
+
+}
+
+button, input[type="submit"], input[type="reset"] {
+    background-color: #845663;
+    color: white;
+    padding: 0 10px;
+    border: none;
 }
 
 /* Tables */
@@ -159,9 +174,9 @@ div[data-title]:hover:after{
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
     border-radius: 5px;
-    -moz-box-shadow: 0px 0px 4px #222;
+    -moz-box-shadow: 0 0 4px #222;
-    -webkit-box-shadow: 0px 0px 4px #222;
+    -webkit-box-shadow: 0 0 4px #222;
-    box-shadow: 0px 0px 4px #222;
+    box-shadow: 0 0 4px #222;
     background-color: #333;
     font-size: 15px;
     line-height: normal;

website/styles/settings.css

@@ -1,13 +1,6 @@
-.settings {
-
-}
-
 .settings input,
 .settings textarea{
-    padding: 10px;
     margin: 5px;
-    border-radius: 10px;
-    width: 200px;
 }
 
 .settings label {
@@ -16,18 +9,11 @@
     text-align: right;
 }
 
+/* All the fields for typing things. */
 .settings input[type="password"],
 .settings input[type="text"],
 .settings input[type="date"],
 .settings input[type="email"],
 .settings textarea {
-    border: 1px solid black;
+    width: 200px;
-}
-
-.settings-password {
-
-}
-
-.settings-profile {
-
 }

website/views/settings-view.php

@@ -44,6 +44,7 @@
 
             <label></label>
             <input type="submit"
+                   value="Opslaan"
             >
         </form>