From 1b97b1fad311bea46363308e06b7cf790e651306 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 12 Jan 2017 14:32:56 +0100 Subject: [PATCH 1/6] slightly modified css --- website/styles/adminpanel.css | 6 ++++++ website/views/adminpanel.php | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css index f22de20..e7d84f4 100644 --- a/website/styles/adminpanel.css +++ b/website/styles/adminpanel.css @@ -6,6 +6,12 @@ box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } +.admin-panel input[type="submit"], button { + background-color: #845663; + color: white; + padding: 5px; +} + .admin-actions { display: inline-block; margin: 10px; diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php index 2723e40..3aa9e63 100644 --- a/website/views/adminpanel.php +++ b/website/views/adminpanel.php @@ -87,7 +87,6 @@ - From d14688295fdb74f58043c8ff8c592e8788171ff0 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 12 Jan 2017 15:55:25 +0100 Subject: [PATCH 2/6] 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

From 58779a3d4d71a8c36ad83e7e1056e13b236affb7 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 12 Jan 2017 15:59:16 +0100 Subject: [PATCH 3/6] cleaning --- website/styles/adminpanel.css | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css index b8a33c9..9896568 100644 --- a/website/styles/adminpanel.css +++ b/website/styles/adminpanel.css @@ -6,18 +6,12 @@ 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; @@ -78,7 +72,3 @@ .usertable tr:hover { background-color: #f5f5f5; } - -/*div { - border: 1px solid black; -}*/ From 89df0aba5251b2314950eabef8cf52a3e07ee18e Mon Sep 17 00:00:00 2001 From: Hendrik Date: Fri, 13 Jan 2017 10:20:34 +0100 Subject: [PATCH 4/6] readied for merge --- website/styles/adminpanel.css | 9 +++++---- website/views/adminpanel.php | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css index 9896568..be4da96 100644 --- a/website/styles/adminpanel.css +++ b/website/styles/adminpanel.css @@ -1,9 +1,10 @@ .admin-panel { margin: auto; - background-color: white; + /*background-color: white; border-radius: 10px; padding: 15px; - box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);*/ + min-width: 800px; } .admin-title { @@ -12,11 +13,11 @@ border-bottom: 4px solid #845663; } -.admin-panel input[type="submit"], button { +/*.admin-panel input[type="submit"], button { background-color: #845663; color: white; padding: 5px; -} +}*/ .admin-actions { display: inline-block; diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php index f9e4da3..c11d648 100644 --- a/website/views/adminpanel.php +++ b/website/views/adminpanel.php @@ -18,7 +18,7 @@
-
+

User Management Panel


From 8852a0d9184fbe6bf68f3e0a62df07cc21697131 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Fri, 13 Jan 2017 10:23:31 +0100 Subject: [PATCH 5/6] use platform --- website/styles/adminpanel.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css index be4da96..3c26fdb 100644 --- a/website/styles/adminpanel.css +++ b/website/styles/adminpanel.css @@ -1,4 +1,4 @@ -.admin-panel { +.platform { margin: auto; /*background-color: white; border-radius: 10px; From 83c994468ffc0f98eb7caa709fd224410a4c1557 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Fri, 13 Jan 2017 10:37:06 +0100 Subject: [PATCH 6/6] ready for merge --- website/styles/adminpanel.css | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css index 3c26fdb..f63bcab 100644 --- a/website/styles/adminpanel.css +++ b/website/styles/adminpanel.css @@ -1,9 +1,5 @@ .platform { margin: auto; - /*background-color: white; - border-radius: 10px; - padding: 15px; - box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);*/ min-width: 800px; } @@ -19,6 +15,10 @@ padding: 5px; }*/ +input[type="radio"], input[type="checkbox"] { + height: auto; +} + .admin-actions { display: inline-block; padding: 8px; @@ -35,8 +35,6 @@ } .admin-searchinput { - border: 2px solid #B78996; - border-radius: 2px; margin-bottom: 10px; }