From bd362585484518d7af5a8da46510961a2f38c0b4 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Fri, 13 Jan 2017 15:38:23 +0100 Subject: [PATCH 1/4] fixed php --- website/login.php | 221 ++---------------------------- website/styles/index.css | 247 +++++++++++++++++----------------- website/views/login-view.php | 254 +++++++++++++++++++++++++++++++++++ website/views/login_head.php | 10 ++ 4 files changed, 399 insertions(+), 333 deletions(-) create mode 100644 website/views/login-view.php create mode 100644 website/views/login_head.php diff --git a/website/login.php b/website/login.php index 664746f..c9a87a8 100644 --- a/website/login.php +++ b/website/login.php @@ -1,217 +1,14 @@ - - - - - - - MyHyvesbook+ - + -
- MyHyvesbook+ -
- -
-

Welkom bij MyHyvesbook+

- - - - - - -
- -
- -
- -
- -
+ - - - - diff --git a/website/styles/index.css b/website/styles/index.css index 14c01ea..b4daae7 100644 --- a/website/styles/index.css +++ b/website/styles/index.css @@ -1,3 +1,47 @@ +::selection { + background: #845663; + color: white; +} + +::-moz-selection { + background: #845663; + color: white; +} + +a, a:link, a:visited, a:hover, a:active { + color: inherit; + text-decoration: none; +} + + +a[data-title]:hover:after, img[data-title]:hover:after, span[data-title]:hover:after, +div[data-title]:hover:after{ + content: attr(data-title); + padding: 4px 4px; + color: #FFFFFF; + position: absolute; + left: 0; + top: 100%; + z-index: 20; + white-space: nowrap; + -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; + background-color: #333; + font-size: 15px; + line-height: normal; + font-family: Arial, sans-serif; +} + +/* Add Zoom Animation */ +.animate { + animation: animatezoom 0.6s + -webkit-animation: animatezoom 0.6s; +} + /* Body */ body { height: 100%; @@ -8,6 +52,39 @@ body { font-family: Arial, sans-serif; } +/* stijl voor alle buttons */ +button { + background-color: #845663; + border: 2px solid black; + border-radius: 12px; + color: white; + cursor: pointer; + height: 50%; + margin: 8px 0; + padding: 14px 20px; + width: 25%; + font-family: Arial; + font-size: 16px; +} + +/* The Close Button */ +.close { + /* Position it in the top right corner outside of the modal */ + color: white; + font-size: 100px; + font-weight: bold; + position: absolute; + right: 25px; + top: 0; +} + +/* Close button on hover */ +.close:hover, +.close:focus { + color: red; + cursor: pointer; +} + /* inlogform */ form { background-color: #a87a87; @@ -32,76 +109,47 @@ h2 { font-size: 2.0em; } +input[type=text], input[type=password], input[type=email], input[type="date"] { + border-radius: 12px; + border: 5px solid #ccc; + box-sizing: border-box; + display: inline-block; + height: 50%; + padding: 12px 20px; + margin: 8px 0; + width: 50%; + font-family: Arial; + font-size: 16px; +} + +input[type=submit] { + background-color: #845663; + border: 2px solid black; + border-radius: 12px; + color: white; + cursor: pointer; + height: 50%; + margin: 8px 0; + padding: 14px 20px; + width: 50%; + font-family: Arial; + font-size: 16px; +} + label { display: block; } -/* datepicker */ -select { - border-radius: 12px; - border: 5px solid #ccc; - box-sizing: border-box; - display: inline-block; - height: 50%; - padding: 12px 20px; - margin: 8px 0; - width: 15%; - font-family: Arial; - font-size: 16px; -} - -input[type=text], input[type=password], input[type=email] { - border-radius: 12px; - border: 5px solid #ccc; - box-sizing: border-box; - display: inline-block; - height: 50%; - padding: 12px 20px; - margin: 8px 0; - width: 50%; - font-family: Arial; - font-size: 16px; -} - -input[type=submit]{ - background-color: #845663; - border: 2px solid black; - border-radius: 12px; - color: white; - cursor: pointer; - height: 50%; - margin: 8px 0; - padding: 14px 20px; - width: 50%; - font-family: Arial; - font-size: 16px; -} - -/* stijl voor alle buttons */ -button { - background-color: #845663; - border: 2px solid black; - border-radius: 12px; - color: white; - cursor: pointer; - height: 50%; - margin: 8px 0; - padding: 14px 20px; - width: 25%; - font-family: Arial; - font-size: 16px; -} - /* padding voor registreer container */ .login_containerregister { - padding: 16px; - text-align: left; + padding: 16px; + text-align: left; } /* padding voor login_containers */ .login_containerlogin { - padding: 16px; - text-align: center; + padding: 16px; + text-align: center; } /* The Modal (background) */ @@ -130,28 +178,23 @@ button { height: 80%; } -/* The Close Button */ -.close { - /* Position it in the top right corner outside of the modal */ - color: white; - font-size: 100px; - font-weight: bold; - position: absolute; - right: 25px; - top: 0; +@keyframes animatezoom { + from {transform: scale(0)} + to {transform: scale(1)} } -/* Close button on hover */ -.close:hover, -.close:focus { - color: red; - cursor: pointer; -} - -/* Add Zoom Animation */ -.animate { - animation: animatezoom 0.6s - -webkit-animation: animatezoom 0.6s; +/* datepicker */ +select { + border-radius: 12px; + border: 5px solid #ccc; + box-sizing: border-box; + display: inline-block; + height: 50%; + padding: 12px 20px; + margin: 8px 0; + width: 18%; + font-family: Arial; + font-size: 16px; } @-webkit-keyframes animatezoom { @@ -159,45 +202,7 @@ button { to {-webkit-transform: scale(1)} } -@keyframes animatezoom { - from {transform: scale(0)} - to {transform: scale(1)} -} - -::selection { - background: #845663; - color: white; -} - -::-moz-selection { - background: #845663; - color: white; -} - -a, a:link, a:visited, a:hover, a:active { - color: inherit; - text-decoration: none; -} - - -a[data-title]:hover:after, img[data-title]:hover:after, span[data-title]:hover:after, -div[data-title]:hover:after{ - content: attr(data-title); - padding: 4px 4px; - color: #FFFFFF; - position: absolute; - left: 0; - top: 100%; - z-index: 20; - white-space: nowrap; - -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; - background-color: #333; - font-size: 15px; - line-height: normal; - font-family: Arial, sans-serif; +ul { + font-family: Arial; + font-size: 16px; } diff --git a/website/views/login-view.php b/website/views/login-view.php new file mode 100644 index 0000000..f8e163b --- /dev/null +++ b/website/views/login-view.php @@ -0,0 +1,254 @@ + + + +
+ MyHyvesbook+ +
+ +
+

Welkom bij MyHyvesbook+

+ + + + + + +
+ +
+ +
+ +
+ +
+ + + + diff --git a/website/views/login_head.php b/website/views/login_head.php new file mode 100644 index 0000000..6111b5d --- /dev/null +++ b/website/views/login_head.php @@ -0,0 +1,10 @@ + + + MyHyvesbook+ + + + + + From 96dd0864ee73c29655f31e6410144718a6dff5d4 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Fri, 13 Jan 2017 15:47:35 +0100 Subject: [PATCH 2/4] Fixed login new filetree --- website/login.php | 14 --- website/public/login.php | 221 ++------------------------------------- 2 files changed, 9 insertions(+), 226 deletions(-) delete mode 100644 website/login.php diff --git a/website/login.php b/website/login.php deleted file mode 100644 index fe3adea..0000000 --- a/website/login.php +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - diff --git a/website/public/login.php b/website/public/login.php index dbce625..0018067 100644 --- a/website/public/login.php +++ b/website/public/login.php @@ -1,217 +1,14 @@ - - - - - - - MyHyvesbook+ - + -
- MyHyvesbook+ -
- -
-

Welkom bij MyHyvesbook+

- - - - - - -
- - - - + - - - - From 2ad1b49cfdfe94ffd38c5813ee314f9ee1af1498 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Fri, 13 Jan 2017 15:52:46 +0100 Subject: [PATCH 3/4] Added popup --- website/views/login-view.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/views/login-view.php b/website/views/login-view.php index f8e163b..7ee3d66 100644 --- a/website/views/login-view.php +++ b/website/views/login-view.php @@ -42,7 +42,9 @@ $confirmpasswordErr = "Wachtwoorden matchen niet"; $correct = false; ?> - + Date: Fri, 13 Jan 2017 16:09:56 +0100 Subject: [PATCH 4/4] Made an index --- website/public/index.php | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 website/public/index.php diff --git a/website/public/index.php b/website/public/index.php new file mode 100644 index 0000000..914192b --- /dev/null +++ b/website/public/index.php @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file