Merge branch 'master' into 'marijn-postdelete'

# Conflicts: # website/public/js/masonry.js
2017-02-01 14:41:45 +01:00
parent dbfe10f84b 7955509cb2
commit 96f421d088
9 changed files with 210 additions and 87 deletions
--- a/website/public/styles/post-popup.css
+++ b/website/public/styles/post-popup.css
@@ -14,7 +14,7 @@

 /* Modal Content/Box */
 .modal-content {
-    margin: 5% auto;
+    margin: 50px auto;
    width: 70%; /* Could be more or less, depending on screen size */
    overflow-y: auto;
 }