From fabfb416e8102cc0d05233c96153c40bd89c293e Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 12:14:09 +0100 Subject: [PATCH 001/360] Changed input default style This makes a clean overall style for the buttons, selects and input fields. Now it looks more the same in all the browsers. --- website/styles/header.css | 10 ++++------ website/styles/main.css | 21 ++++++++++++++++----- website/styles/search.css | 0 3 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 website/styles/search.css diff --git a/website/styles/header.css b/website/styles/header.css index dfbd8a0..d0c9d43 100644 --- a/website/styles/header.css +++ b/website/styles/header.css @@ -26,16 +26,14 @@ header { } #header-search input[type="text"] { - padding: 5px 10px; - height: 19px; - + padding: 0 5px; border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -#header-search input[type="submit"] { - margin: 0 0 0 -4px; - padding: 5px; +#header-search input[type="submit"] { + background: none; + color: white; border-top-right-radius: 3px; border-bottom-right-radius: 3px; } diff --git a/website/styles/main.css b/website/styles/main.css index 52df4f0..f426fc0 100644 --- a/website/styles/main.css +++ b/website/styles/main.css @@ -43,6 +43,7 @@ body { .platform { padding: 20px; + margin-bottom: 10px; border-radius: 10px; background-color: #FFFFFF; box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); @@ -65,11 +66,6 @@ body { border: 0; } - -input[type="text"] { - padding: 5px; -} - /* Move element down (clear), below floating elements */ .clear { clear: both; @@ -106,6 +102,10 @@ h5 { font-size: 1.4em; } +ul { + list-style-type: none; +} + p { font-size: 1.2em; } @@ -115,6 +115,17 @@ a, a:link, a:visited, a:hover, a:active { text-decoration: none; } +button, input, select { + width: auto; + height: 32px; + background: white; + cursor: pointer; + font-family: Arial; + font-size: 16px; + color: #3333333; + border: none; +} + /* Tables */ table { border-spacing: 0; diff --git a/website/styles/search.css b/website/styles/search.css new file mode 100644 index 0000000..e69de29 -- 2.49.1 From 39b849d7eed8da5ace5db60652f7b8c3e07f3a73 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 12:19:07 +0100 Subject: [PATCH 002/360] Added default padding to the input fields --- website/styles/search.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/website/styles/search.css b/website/styles/search.css index e69de29..912723e 100644 --- a/website/styles/search.css +++ b/website/styles/search.css @@ -0,0 +1,3 @@ +.search-form input { + border-bottom: #845663 solid 1px; +} \ No newline at end of file -- 2.49.1 From 2434ffc67524d9ac897d18b5925fcce24a4f4565 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 12:20:47 +0100 Subject: [PATCH 003/360] Added filter on the search page. --- website/styles/main.css | 8 +++-- website/views/head.php | 1 + website/views/header.php | 2 +- website/views/search-view.php | 56 ++++++++++++++++++++++++++++++++++- 4 files changed, 63 insertions(+), 4 deletions(-) diff --git a/website/styles/main.css b/website/styles/main.css index f426fc0..1346635 100644 --- a/website/styles/main.css +++ b/website/styles/main.css @@ -118,12 +118,16 @@ 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-size: 16px; - color: #3333333; - border: none; } /* Tables */ diff --git a/website/views/head.php b/website/views/head.php index 3266463..435fe81 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -13,6 +13,7 @@ @import url("styles/header.css"); @import url("styles/menu.css"); @import url("styles/footer.css"); + @import url("styles/search.css"); @import url("styles/chat.css"); diff --git a/website/views/header.php b/website/views/header.php index 86686a5..7c7b431 100644 --- a/website/views/header.php +++ b/website/views/header.php @@ -4,7 +4,7 @@ diff --git a/website/views/search-view.php b/website/views/search-view.php index 4116e31..27c794c 100644 --- a/website/views/search-view.php +++ b/website/views/search-view.php @@ -1,5 +1,59 @@
- Hey +
+ + + + +
+
+
\ No newline at end of file -- 2.49.1 From 4cb9a83d624e9ed902534fece78836aaca7c243a Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Thu, 12 Jan 2017 14:18:49 +0100 Subject: [PATCH 004/360] fixed identation --- website/login.php | 283 +++++++++++++++++++++++----------------------- 1 file changed, 141 insertions(+), 142 deletions(-) diff --git a/website/login.php b/website/login.php index 8d6a319..73e6216 100644 --- a/website/login.php +++ b/website/login.php @@ -1,159 +1,158 @@ - - - - - - MyHyvesbook+ - - -
- MyHyvesbook+ -
+ + + + + + MyHyvesbook+ + + +
+ MyHyvesbook+ +
-
-

Welkom bij MyHyvesbook+

- + +

Welkom bij MyHyvesbook+

+ - + - -
- - - - - - + + + + + -- 2.49.1 From 0e44fb34c09edfae98b5ef0b340d6fc062d22123 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 12 Jan 2017 14:32:39 +0100 Subject: [PATCH 005/360] removed padding in input search --- website/styles/header.css | 1 - 1 file changed, 1 deletion(-) diff --git a/website/styles/header.css b/website/styles/header.css index d0c9d43..ffeaab6 100644 --- a/website/styles/header.css +++ b/website/styles/header.css @@ -26,7 +26,6 @@ header { } #header-search input[type="text"] { - padding: 0 5px; border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -- 2.49.1 From 1b97b1fad311bea46363308e06b7cf790e651306 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 12 Jan 2017 14:32:56 +0100 Subject: [PATCH 006/360] 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 36192c6bf4677ec75047dc9272bed6b3ac60617b Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Thu, 12 Jan 2017 14:44:59 +0100 Subject: [PATCH 007/360] fixed spelling and grammar --- website/login.php | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/website/login.php b/website/login.php index 73e6216..9211818 100644 --- a/website/login.php +++ b/website/login.php @@ -16,15 +16,15 @@

Welkom bij MyHyvesbook+