Merge branch 'marijn-settings' into 'master'

Settings

See merge request !33

website/styles/footer.css

@@ -9,4 +9,5 @@ footer p {
     padding: 5px;
 
     font-size: 14px;
+    color: #dddddd;
 }

website/styles/settings.css

@@ -1,10 +1,11 @@
 .settings input,
 .settings textarea {
     margin: 5px;
+    resize: none;
 }
 
 .settings label {
-    width: 125px;
+    width: 175px;
     display: inline-block;
     text-align: right;
 }
@@ -17,3 +18,11 @@
 .settings textarea {
     width: 200px;
 }
+
+.settings textarea {
+    width: 400px;
+}
+
+.settings label[for="bio"] {
+    vertical-align: middle;
+}

website/views/settings-view.php

@@ -36,7 +36,6 @@
             <label for="bio">Bio</label>
             <textarea name="bio"
                       rows="5"
-                      cols="10"
                       title="bio"
                       id="bio"
             ></textarea>
@@ -48,22 +47,25 @@
             >
         </form>
 
-
         <form class="settings-password platform" method="post">
             <h5>Verander Wachtwoord</h5>
             <br />
+            <label>Oud Wachtwoord</label>
             <input type="password"
                    name="password-old"
                    placeholder="Oud wachtwoord"
             ><br />
+            <label>Nieuw wachtword</label>
             <input type="password"
                    name="password-new"
                    placeholder="Nieuw wachtwoord"
             ><br />
+            <label>Bevestig wachtwoord</label>
             <input type="password"
                    name="password-confirm"
                    placeholder="Bevestig wachtwoord"
             ><br />
+            <label></label>
             <input type="submit"
                    value="Verander wachtwoord"
             >
@@ -72,14 +74,19 @@
         <form class="settings-email platform" method="post">
             <h5>Verander Email</h5>
             <br />
+            <label for="email">Nieuw Email</label>
             <input type="email"
                    name="email"
-                   placeholder="Nieuw Email-adres"
+                   id="email"
+                   placeholder="Nieuw Email"
             ><br />
+            <label for="email-confirm">Bevestig Email</label>
             <input type="email"
                    name="email-confirm"
+                   id="email-confirm"
                    placeholder="Bevestig Email"
             ><br />
+            <label></label>
             <input type="submit"
                    value="Verander Email"
             >