diff --git a/css/la.css b/css/la.css index b28a283b9629dba21827d009ae7ce416decd10e7..7196c31b2696288a7b75f5b95bf8e4c132cd7151 100644 --- a/css/la.css +++ b/css/la.css @@ -73,7 +73,22 @@ body :-ms-input-placeholder { z-index: 2; } -.form-group1, .form-group2 { +label { + display: inline-block; + width: 150px; +} + +.form-group1{ + + display: inline-block; + width: 450px; + color: black; +} + +.form-group2{ + + display: inline-block; + width: 450px; color: black; } diff --git a/land.html b/land.html index e61a39a6e42f55f87bf1cc6cef875e3c679078c3..d86770ee71e2c3b02c6f19f2c3b65eb9305f76b9 100644 --- a/land.html +++ b/land.html @@ -17,9 +17,11 @@ <div class="container"> <h1>Welcome to Hodor!</h1> <div class="loginform"> - <form class="login"> - <button type="button" id="login-button" data-toggle="modal" data-target="#login-modal">Sign-in/Sign-up</button> - </form> + <form class="login"> + <button type="button" id="login-button" data-toggle="modal" data-target="#login-modal">Log in</button> + <button type="button" id="signup-button" data-toggle="modal" data-target="#login-modal">Register</button> + + </form> </div> <ul class="bg-bubbles"> <li></li> @@ -40,23 +42,27 @@ <div id="login-modal" class="modal fade" role="dialog"> <div class="modal-dialog"> <div class="modal-content"> - <div class="modal-body"> - <ul class="nav nav-pills nav-justified"> - <li class="active"><a data-toggle="pill" href="#login">Login</a></li> - <li><a data-toggle="pill" href="#register">Register</a></li> + <div class="modal-header"> + <ul class="nav nav-pills nav-justified"> + <li class="active"><a data-toggle="pill" href="#login">Login</a></li> + <li><a data-toggle="pill" href="#register">Register</a></li> </ul> + </div> + <div class="modal-body"> <div id="login" class="tab-pane fade"> <form class="form1"> <div class="form-group1"> <label for="usrname">Username</label> - <input type="text" class="form-control" id="usrname"> + <input type="text" class="form-control" id="usrname"> </br> </div> <div class="form-group1"> - <label for="pword">Password:</label> - <input type="password" class="form-control" id="pword"> + <label for="pword">Password</label> + <input type="password" class="form-control" id="pword"> </br> </div> - <button type="submit" class="btn btn-success" style="align-self: center">Login</button> - <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button> + <!--<div class="modal-footer"> + <button type="submit" class="btn btn-success" style="align-self: center">Submit</button> + <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button> + </div> --> </form> </div> @@ -64,31 +70,38 @@ <form class="form2"> <div class="form-group2"> <label for="name">Name</label> - <input type="text" class="form-control" id="name"> - </div> - <div class="form-group2"> + <input type="text" class="form-control" id="name"> </br> + <label for="uname">Username</label> - <input type="text" class="form-control" id="uname"> - </div> - <div class="form-group2"> - <label for="email">Email address:</label> - <input type="email" class="form-control" id="email"> - </div> - <div class="form-group2"> - <label for="pwd">Password:</label> - <input type="password" class="form-control" id="pwd"> - <label for="rpwd"> Re-enter Password:</label> - <input type="password" class="form-control" id="rpwd"> + <input type="text" class="form-control" id="uname"> </br> + + <label for="email">Email address</label> + <input type="email" class="form-control" id="email"> </br> + + <label for="pwd">Password</label> + <input type="password" class="form-control" id="pwd"> </br> + + <label for="rpwd"> Re-enter Password</label> + <input type="password" class="form-control" id="rpwd"> </br> </div> - <button type="submit" class="btn btn-success" style="align-self: center">Submit</button> - <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button> + + + <!--<div class="modal-footer"> + <button type="submit" class="btn btn-success" style="align-self: center">Submit</button> + <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button> + </div> --> + </form> - </div> + <!-- </div> --> </div> + <div class="modal-footer"> + <button type="submit" class="btn btn-success">Submit</button> + <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button> + </div> </div> </div> </div> - </div> - </div> + <!-- </div> + </div> --> </body> </html>