Merge branch 'master' into lars

2017-02-03 10:15:10 +01:00
parent 6d739a4480 820ffb4a62
commit da01729b61
12 changed files with 43 additions and 239 deletions
--- a/website/public/styles/index.css
+++ b/website/public/styles/index.css
@@ -198,12 +198,6 @@ ul {
    animation-duration: 0.4s
 }

-/* Add Animation */
-@-webkit-keyframes animatetop {
-    from {top:-300px; opacity:0}
-    to {top:0; opacity:1}
-}
-
@keyframes animatetop {
    from {top:-300px; opacity:0}
    to {top:0; opacity:1}