Merge with current master

2017-01-11 11:14:07 +01:00
parent 8b74917b21
commit 17d1f96a02
3 changed files with 30 additions and 12 deletions
--- a/website/styles/main.css
+++ b/website/styles/main.css
@@ -16,7 +16,7 @@ body {
 }

 .content {
-    margin-top: 95px;
+    margin-top: 80px;
 }

 ::selection {
@@ -36,11 +36,6 @@ body {
    border: 0;
 }

-input[type="submit"], button {
-    background-color: #845663;
-    color: white;
-    padding: 5px;
-}

 input[type="text"] {
    padding: 5px;