Merge branch 'master' into lars

2017-02-03 11:19:02 +01:00
parent 53e1d7fef3 000d1f4072
commit 4eae09dfc7
16 changed files with 219 additions and 28 deletions
--- a/website/public/styles/adminpanel.css
+++ b/website/public/styles/adminpanel.css
@@ -36,9 +36,10 @@
    width: 100%;
 }

-.usertable .table-username {width: 150px}
-.usertable .table-status {width: 100px}
-.usertable .table-action {width: 200px}
+.table-checkbox {width: 20px}
+.table-username {width: 150px}
+.table-status {width: 100px}
+.table-action {width: 200px}

 .usertable th, td {
    border-bottom: 1px solid #ddd;
@@ -54,6 +55,10 @@
    background-color: #f5f5f5;
 }

+.bancomment {
+    width: 80%;
+}
+
 .bancommentedit {
    display: none;
 }