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

Merge branch 'joey-testing' into 'master'

Browse Source 
Fixed css and confirmation for logged in already

See merge request !96
This commit was merged in pull request #100.
This commit is contained in:
Marijn Jansen
2017-01-23 13:26:10 +01:00
parent af11297fad 21ff896d65
commit 449b500636
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/public/styles/index.css
View File

@@ -13,7 +13,7 @@ a.button {
/* Body */ /* Body */
body { body {
height: 900px; height: 100%;
background-color: #C8CABD; background-color: #C8CABD;
/*background-image: url(http://play.pokemonshowdown.com/fx/client-bg-shaymin.jpg); /*background-image: url(http://play.pokemonshowdown.com/fx/client-bg-shaymin.jpg);
background-size: cover; background-size: cover;
@@ -46,7 +46,7 @@ body {
form { form {
/*background-color: #a87a87;*/ /*background-color: #a87a87;*/
border-radius: 12px; border-radius: 12px;
height: 80%; height: 70%;
margin: auto; margin: auto;
width: 70%; width: 70%;
overflow-y:auto; overflow-y:auto;
@@ -159,7 +159,7 @@ label {
background-repeat: repeat-x; background-repeat: repeat-x;
background-attachment: fixed;*/ background-attachment: fixed;*/
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
height: 550px; height: 500px;
margin: 34px auto; margin: 34px auto;
overflow-y: auto; overflow-y: auto;
padding: 20px; padding: 20px;

4
website/views/login_head.php
View File

@@ -7,6 +7,6 @@
<link rel="stylesheet" <link rel="stylesheet"
type="text/css" type="text/css"
href="styles/index.css"> href="styles/index.css">
<script src="jqeury.js"></script> <script src="/js/jqeury.js"></script>
<script src="registerAndLogin.js"></script> <script src="/js/registerAndLogin.js"></script>
</head> </head>