Merge branch 'master' into kevin-prototype

2017-01-25 15:08:34 +01:00
parent 9ff256429d c23b8bd8e5
commit 95570c49d4
21 changed files with 253 additions and 54 deletions
--- a/website/public/styles/index.css
+++ b/website/public/styles/index.css
@@ -1,6 +1,6 @@
 a.button {
    background-color: #C8CABD;
-    border-radius: 10px;
+    border-radius: 5px;
    color: black;
    cursor: pointer;
    height: 50%;
--- a/website/public/styles/menu.css
+++ b/website/public/styles/menu.css
@@ -63,4 +63,32 @@

 #quick-links i:hover {
    color: #FBC02D;
+}
+
+.notification-options {
+    display: none;
+    width: 100%;
+}
+
+.notification-options form {
+    width: 100%;
+    text-align: center;
+}
+
+.notification-options button {
+    display: inline-block;
+    padding: 5px 20px;
+    width: auto;
+}
+
+.accept-notification:hover {
+    color: #4CAF50;
+}
+
+.deny-notification:hover {
+    color: firebrick;
+}
+
+.friend-item:hover .notification-options {
+    display: inline-block;
 }