From 1b97b1fad311bea46363308e06b7cf790e651306 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 12 Jan 2017 14:32:56 +0100 Subject: [PATCH 001/353] 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 @@ - -- 2.49.1 From 2905a9efee40421cec36d0416dc281399f6ee01a Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 15:13:09 +0100 Subject: [PATCH 002/353] Changed background color header --- website/styles/header.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/styles/header.css b/website/styles/header.css index ffeaab6..038275f 100644 --- a/website/styles/header.css +++ b/website/styles/header.css @@ -8,7 +8,7 @@ header { width: 100%; color: white; - background-color: #845663; + background-color: rgba(132,86,99, 0.98); box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } -- 2.49.1 From d900edfcda94feb8dca538d8209c8d73faa43fa1 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 15:20:47 +0100 Subject: [PATCH 003/353] Updated buttons --- website/styles/settings.css | 7 ++++++- website/views/settings-view.php | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/website/styles/settings.css b/website/styles/settings.css index 933f8b0..e5b629e 100644 --- a/website/styles/settings.css +++ b/website/styles/settings.css @@ -16,11 +16,16 @@ text-align: right; } +.settings input[type="submit"] { + background-color: #845663; + color: white; +} + .settings input[type="password"], .settings input[type="text"], .settings input[type="date"], .settings input[type="email"], -.settings textarea{ +.settings textarea { border: 1px solid black; } diff --git a/website/views/settings-view.php b/website/views/settings-view.php index 12415b4..7caf36c 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -44,6 +44,7 @@ -- 2.49.1 From f481c1c611c7732a7323f3fb3fdedf63e6bf4bf4 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 15:41:13 +0100 Subject: [PATCH 004/353] More uniform main css file. --- website/styles/main.css | 31 +++++++++++++++++++++++-------- website/styles/settings.css | 23 ++--------------------- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/website/styles/main.css b/website/styles/main.css index 1346635..cbf9477 100644 --- a/website/styles/main.css +++ b/website/styles/main.css @@ -118,16 +118,31 @@ a, a:link, a:visited, a:hover, a:active { button, input, select { width: auto; height: 32px; - padding: 0 5px; - - background: white; - color: #3333333; cursor: pointer; border: none; - font-family: Arial; + font-family: Arial, sans-serif; font-size: 16px; + border-radius: 7px; +} + +textarea, input, select { + padding: 0 5px; + background: white; + color: #333333; + border: 1px solid #845663; + border-radius: 7px; + font-size: 16px; + + +} + +button, input[type="submit"], input[type="reset"] { + background-color: #845663; + color: white; + padding: 0 10px; + border: none; } /* Tables */ @@ -159,9 +174,9 @@ div[data-title]:hover:after{ -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; - -moz-box-shadow: 0px 0px 4px #222; - -webkit-box-shadow: 0px 0px 4px #222; - box-shadow: 0px 0px 4px #222; + -moz-box-shadow: 0 0 4px #222; + -webkit-box-shadow: 0 0 4px #222; + box-shadow: 0 0 4px #222; background-color: #333; font-size: 15px; line-height: normal; diff --git a/website/styles/settings.css b/website/styles/settings.css index e5b629e..751d0dc 100644 --- a/website/styles/settings.css +++ b/website/styles/settings.css @@ -1,13 +1,6 @@ -.settings { - -} - .settings input, .settings textarea{ - padding: 10px; margin: 5px; - border-radius: 10px; - width: 200px; } .settings label { @@ -16,23 +9,11 @@ text-align: right; } -.settings input[type="submit"] { - background-color: #845663; - color: white; -} - +/* All the fields for typing things. */ .settings input[type="password"], .settings input[type="text"], .settings input[type="date"], .settings input[type="email"], .settings textarea { - border: 1px solid black; -} - -.settings-password { - -} - -.settings-profile { - + width: 200px; } \ No newline at end of file -- 2.49.1 From d2ab86c0a255a907d1411db5b204a959d421622a Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 15:41:46 +0100 Subject: [PATCH 005/353] Prepared for uniform css inputs --- website/styles/header.css | 13 ------------- website/styles/search.css | 3 --- website/views/search-view.php | 3 +++ 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/website/styles/header.css b/website/styles/header.css index ffeaab6..eb1451e 100644 --- a/website/styles/header.css +++ b/website/styles/header.css @@ -25,19 +25,6 @@ header { padding-left: 48px; } -#header-search input[type="text"] { - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; -} - -#header-search input[type="submit"] { - background: none; - color: white; - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; -} - - header div { display: inline-block; } diff --git a/website/styles/search.css b/website/styles/search.css index 912723e..e69de29 100644 --- a/website/styles/search.css +++ b/website/styles/search.css @@ -1,3 +0,0 @@ -.search-form input { - border-bottom: #845663 solid 1px; -} \ No newline at end of file diff --git a/website/views/search-view.php b/website/views/search-view.php index 27c794c..1bd2286 100644 --- a/website/views/search-view.php +++ b/website/views/search-view.php @@ -18,6 +18,9 @@ x +
-- 2.49.1 From 984800fd0c5a90460be84e571dd5b1b9b0bcf7d2 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 15:52:14 +0100 Subject: [PATCH 006/353] End of day. --- website/styles/settings.css | 13 +++++++++++-- website/views/settings-view.php | 13 ++++++++++--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/website/styles/settings.css b/website/styles/settings.css index 751d0dc..9a2c753 100644 --- a/website/styles/settings.css +++ b/website/styles/settings.css @@ -1,10 +1,11 @@ .settings input, -.settings textarea{ +.settings textarea { margin: 5px; + resize: none; } .settings label { - width: 125px; + width: 175px; display: inline-block; text-align: right; } @@ -16,4 +17,12 @@ .settings input[type="email"], .settings textarea { width: 200px; +} + +.settings textarea { + width: 400px; +} + +.settings label[for="bio"] { + vertical-align: middle; } \ No newline at end of file diff --git a/website/views/settings-view.php b/website/views/settings-view.php index 7caf36c..797217e 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -36,7 +36,6 @@ @@ -48,22 +47,25 @@ > -
Verander Wachtwoord

+
+
+
+ @@ -72,14 +74,19 @@
Verander Email

+
+
+ -- 2.49.1 From d14688295fdb74f58043c8ff8c592e8788171ff0 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 12 Jan 2017 15:55:25 +0100 Subject: [PATCH 007/353] 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

-- 2.49.1 From 58779a3d4d71a8c36ad83e7e1056e13b236affb7 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 12 Jan 2017 15:59:16 +0100 Subject: [PATCH 008/353] 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; -}*/ -- 2.49.1 From 89df0aba5251b2314950eabef8cf52a3e07ee18e Mon Sep 17 00:00:00 2001 From: Hendrik Date: Fri, 13 Jan 2017 10:20:34 +0100 Subject: [PATCH 009/353] 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


-- 2.49.1 From 8852a0d9184fbe6bf68f3e0a62df07cc21697131 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Fri, 13 Jan 2017 10:23:31 +0100 Subject: [PATCH 010/353] 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; -- 2.49.1 From 83c994468ffc0f98eb7caa709fd224410a4c1557 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Fri, 13 Jan 2017 10:37:06 +0100 Subject: [PATCH 011/353] 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; } -- 2.49.1 From 02149565cec398b8bd83511e56bc5a09c037ad9f Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Fri, 13 Jan 2017 10:39:37 +0100 Subject: [PATCH 012/353] Fixed post width for Chrome --- website/styles/profile.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/styles/profile.css b/website/styles/profile.css index 1ac9a2b..7c6218c 100644 --- a/website/styles/profile.css +++ b/website/styles/profile.css @@ -49,12 +49,12 @@ /* fullscreen */ .post-box { - width: calc(25% - 68px); + width: calc(25% - 69px); } @media only screen and (max-width: 1500px) { .post-box { - width: calc(50% - 67px); + width: calc(50% - 68px); } } -- 2.49.1 From 863fde55e995a99d04c4adb201b04d51de6d8e7a Mon Sep 17 00:00:00 2001 From: Hendrik Date: Fri, 13 Jan 2017 10:46:09 +0100 Subject: [PATCH 013/353] minor fixes --- website/styles/adminpanel.css | 2 +- website/views/adminpanel.php | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css index f63bcab..4552951 100644 --- a/website/styles/adminpanel.css +++ b/website/styles/adminpanel.css @@ -1,4 +1,4 @@ -.platform { +.admin-panel { margin: auto; min-width: 800px; } diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php index c11d648..b789aad 100644 --- a/website/views/adminpanel.php +++ b/website/views/adminpanel.php @@ -2,7 +2,6 @@ - Admin Panel + MyHyvesbook+ @@ -14,6 +15,7 @@

Welkom bij MyHyvesbook+

+