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/339] 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/339] 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 057275d513cc4984c50d35171f025164c6a933be Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 13 Jan 2017 11:09:09 +0100 Subject: [PATCH 003/339] 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 -- 2.49.1 From e07281bbff058e60f27554691ef486593ed7fc79 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Fri, 13 Jan 2017 11:38:55 +0100 Subject: [PATCH 004/339] 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+

+