From 2905a9efee40421cec36d0416dc281399f6ee01a Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 15:13:09 +0100 Subject: [PATCH 01/21] 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); } From d2ab86c0a255a907d1411db5b204a959d421622a Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 15:41:46 +0100 Subject: [PATCH 02/21] 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 +
From 984800fd0c5a90460be84e571dd5b1b9b0bcf7d2 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 12 Jan 2017 15:52:14 +0100 Subject: [PATCH 03/21] 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

+
+
+ From 807361e65419a77960c420288915c053afe18ee3 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Fri, 13 Jan 2017 10:52:05 +0100 Subject: [PATCH 04/21] Updated colour for footer. --- website/styles/footer.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/styles/footer.css b/website/styles/footer.css index 2092a7b..53e28f1 100644 --- a/website/styles/footer.css +++ b/website/styles/footer.css @@ -9,4 +9,5 @@ footer p { padding: 5px; font-size: 14px; -} + color: #dddddd; +} \ No newline at end of file From 83de4e4f8a4ed4d212595866a415b848b814dbb4 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Fri, 13 Jan 2017 10:57:06 +0100 Subject: [PATCH 05/21] fixed Add friend picture on profile page --- website/views/profile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/views/profile.php b/website/views/profile.php index 9675a04..e8fae1e 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -2,7 +2,7 @@
-

Als vriend toevoegen

+

Als vriend toevoegen

[gebruikersnaam]

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

From 057275d513cc4984c50d35171f025164c6a933be Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 13 Jan 2017 11:09:09 +0100 Subject: [PATCH 06/21] Restyled the search page Split users and groups added a search button made some boxes required --- website/styles/header.css | 5 +++++ website/styles/search.css | 12 ++++++++++++ website/views/header.php | 9 +++++++-- website/views/search-view.php | 18 +++++++++++++++++- 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/website/styles/header.css b/website/styles/header.css index eb1451e..ea3212a 100644 --- a/website/styles/header.css +++ b/website/styles/header.css @@ -25,6 +25,11 @@ header { padding-left: 48px; } + +#header-search input { + border: none; +} + header div { display: inline-block; } diff --git a/website/styles/search.css b/website/styles/search.css index e69de29..4b2281c 100644 --- a/website/styles/search.css +++ b/website/styles/search.css @@ -0,0 +1,12 @@ +.search-output { + width: calc(50% - 48px); + display: inline-flex; +} + +.search-output:nth-child(n) { + display: inline-block; +} + +#search-friends-output { + margin-right: 10px; +} \ No newline at end of file diff --git a/website/views/header.php b/website/views/header.php index ac8ae19..af3d0f0 100644 --- a/website/views/header.php +++ b/website/views/header.php @@ -4,8 +4,13 @@
diff --git a/website/views/search-view.php b/website/views/search-view.php index 1bd2286..b1418d1 100644 --- a/website/views/search-view.php +++ b/website/views/search-view.php @@ -8,6 +8,7 @@ name="search" placeholder="zoek" value="Rudolf" + required />
-
+ + +
+ +
\ No newline at end of file From e07281bbff058e60f27554691ef486593ed7fc79 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Fri, 13 Jan 2017 11:38:55 +0100 Subject: [PATCH 07/21] FIXED things --- website/login.php | 9 +++---- website/styles/index.css | 56 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/website/login.php b/website/login.php index 9211818..cefaf52 100644 --- a/website/login.php +++ b/website/login.php @@ -3,6 +3,7 @@ + MyHyvesbook+ @@ -14,6 +15,7 @@

Welkom bij MyHyvesbook+

+