From d14688295fdb74f58043c8ff8c592e8788171ff0 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 12 Jan 2017 15:55:25 +0100 Subject: [PATCH] add title, slight css modification --- website/styles/adminpanel.css | 17 ++++++++++++++++- website/views/adminpanel.php | 9 ++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css index e7d84f4..b8a33c9 100644 --- a/website/styles/adminpanel.css +++ b/website/styles/adminpanel.css @@ -6,6 +6,18 @@ box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } +<<<<<<< Updated upstream +======= +.admin-title { + margin: 10px; + /*color: #845663;*/ + /*color: white;*/ + /*text-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);*/ + padding-bottom: 5px; + border-bottom: 4px solid #845663; +} + +>>>>>>> Stashed changes .admin-panel input[type="submit"], button { background-color: #845663; color: white; @@ -14,8 +26,11 @@ .admin-actions { display: inline-block; - margin: 10px; + padding: 8px; vertical-align: top; + border-radius: 10px; + border: 4px solid #845663; + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } .admin-searchbar { diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php index 3aa9e63..f9e4da3 100644 --- a/website/views/adminpanel.php +++ b/website/views/adminpanel.php @@ -19,9 +19,12 @@
-
+
+

User Management Panel

+

+
- +

Search


@@ -35,7 +38,7 @@
-

Actions:

+

Batch Actions:

Mute
Ban
Unban