Merge branch 'master' into lars-chat

website/styles/adminpanel.css

@@ -1,15 +1,25 @@
 .admin-panel {
     margin: auto;
-    background-color: white;
-    border-radius: 10px;
-    padding: 15px;
-    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+    min-width: 800px;
+}
+
+.admin-title {
+    margin: 10px;
+    padding-bottom: 5px;
+    border-bottom: 4px solid #845663;
+}
+
+.admin-panel input[type="radio"], input[type="checkbox"] {
+    height: auto;
 }
 
 .admin-actions {
     display: inline-block;
-    margin: 10px;
+    padding: 8px;
     vertical-align: top;
+    border-radius: 10px;
+    border: 4px solid #845663;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
 }
 
 .admin-searchbar {
@@ -19,8 +29,6 @@
 }
 
 .admin-searchinput {
-    border: 2px solid #B78996;
-    border-radius: 2px;
     margin-bottom: 10px;
 }
 
@@ -31,7 +39,6 @@
     margin-right: 100px;
 }
 
-
 .admin-users {
     margin: 10px;
 }
@@ -57,7 +64,3 @@
 .usertable tr:hover {
     background-color: #f5f5f5;
 }
-
-/*div {
-    border: 1px solid black;
-}*/

website/styles/footer.css

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

website/styles/profile.css

@@ -49,12 +49,12 @@
 
 /* fullscreen */
 .post-box {
-    width: calc(25% - 68px);
+    width: calc(25% - 69px);
 }
 
 @media only screen and (max-width: 1500px) {
     .post-box {
-        width: calc(50% - 67px);
+        width: calc(50% - 68px);
     }
 }
 

website/styles/settings.css

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