MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'joey-testing' into 'master'

Browse Source 
FIXED things

See merge request !37
This commit was merged in pull request #41.
This commit is contained in:
Marijn Jansen
2017-01-13 11:39:47 +01:00
parent 621fb2868d e07281bbff
commit f9fc79ad31
2 changed files with 58 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
website/login.php
View File

@@ -3,6 +3,7 @@
<head> <head>
<link rel="stylesheet" type="text/css" href="styles/index.css"> <link rel="stylesheet" type="text/css" href="styles/index.css">
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
<script src="js/dobPicker.min.js"></script> <script src="js/dobPicker.min.js"></script>
<meta charset="utf-8"> <meta charset="utf-8">
<title>MyHyvesbook+</title> <title>MyHyvesbook+</title>
@@ -14,6 +15,7 @@
<form action="../profile.php" method="post"> <form action="../profile.php" method="post">
<h1>Welkom bij MyHyvesbook+</h1> <h1>Welkom bij MyHyvesbook+</h1>
<div class="login_containerlogin"> <div class="login_containerlogin">
<label><b>Gebruikersnaam</b></label> <label><b>Gebruikersnaam</b></label>
<input type="text" placeholder="Voer uw gebruikersnaam in" name="uname" <input type="text" placeholder="Voer uw gebruikersnaam in" name="uname"
@@ -60,12 +62,12 @@
<div class="login_containerregister"> <div class="login_containerregister">
<label><b>Geboortedatum</b></label> <label><b>Geboortedatum</b></label>
<!-- These are the select elements we will target --> <!-- These are the select elements we will target -->
<select id="dobday" title="Voer een dag in" ></select> <select id="dobday" title="Voer een dag in" required></select>
<select id="dobmonth" title="Voer een maand in" required></select> <select id="dobmonth" title="Voer een maand in" required></select>
<select id="dobyear" title="Voer een jaar in" required></select> <select id="dobyear" title="Voer een jaar in" required></select>
<!-- And here's the library being called! --> <!-- And here's the library being called! -->
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$.dobPicker({ $.dobPicker({
daySelector: '#dobday', daySelector: '#dobday',
monthSelector: '#dobmonth', monthSelector: '#dobmonth',
@@ -124,9 +126,6 @@
</form> </form>
</div> </div>
</div> </div>
<script>
$("#default-settings").birthdayPicker();
</script>
</body> </body>
</html> </html>

56
website/styles/index.css
View File

@@ -1,6 +1,11 @@
/* Body */ /* Body */
body { body {
background-color: #B78996; height: 100%;
background-color: #B78996;
color: #333;
font-family: Arial, sans-serif;
} }
/* inlogform */ /* inlogform */
@@ -17,15 +22,16 @@ form {
h1 { h1 {
padding: 16px; padding: 16px;
text-align: center; text-align: center;
font-size: 2.2em;
} }
/* registreer titel*/ /* registreer titel*/
h2 { h2 {
padding: 16px; padding: 16px;
text-align: left; text-align: left;
font-size: 2.0em;
} }
/* text */
label { label {
display: block; display: block;
} }
@@ -40,6 +46,8 @@ select {
padding: 12px 20px; padding: 12px 20px;
margin: 8px 0; margin: 8px 0;
width: 15%; width: 15%;
font-family: Arial;
font-size: 16px;
} }
input[type=text], input[type=password], input[type=email] { input[type=text], input[type=password], input[type=email] {
@@ -51,6 +59,8 @@ input[type=text], input[type=password], input[type=email] {
padding: 12px 20px; padding: 12px 20px;
margin: 8px 0; margin: 8px 0;
width: 50%; width: 50%;
font-family: Arial;
font-size: 16px;
} }
input[type=submit]{ input[type=submit]{
@@ -63,6 +73,8 @@ input[type=submit]{
margin: 8px 0; margin: 8px 0;
padding: 14px 20px; padding: 14px 20px;
width: 50%; width: 50%;
font-family: Arial;
font-size: 16px;
} }
/* stijl voor alle buttons */ /* stijl voor alle buttons */
@@ -76,6 +88,8 @@ button {
margin: 8px 0; margin: 8px 0;
padding: 14px 20px; padding: 14px 20px;
width: 25%; width: 25%;
font-family: Arial;
font-size: 16px;
} }
/* padding voor registreer container */ /* padding voor registreer container */
@@ -149,3 +163,41 @@ button {
from {transform: scale(0)} from {transform: scale(0)}
to {transform: scale(1)} 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;
}