From 2905a9efee40421cec36d0416dc281399f6ee01a Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 15:13:09 +0100 Subject: [PATCH 001/344] 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 d2ab86c0a255a907d1411db5b204a959d421622a Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 15:41:46 +0100 Subject: [PATCH 002/344] 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 003/344] 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 863fde55e995a99d04c4adb201b04d51de6d8e7a Mon Sep 17 00:00:00 2001 From: Hendrik Date: Fri, 13 Jan 2017 10:46:09 +0100 Subject: [PATCH 004/344] 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+

+