Commit 69d2a8f4 by Torkel Ödegaard

style change to login page

parent d584076b
......@@ -7,36 +7,22 @@
<img src="/img/logo_transparent_200x75.png">
</div>
<form name="loginForm" class="form-horizontal">
<div class="row-fluid">
<div class="span8">
<div class="control-group">
<label class="control-label" for="inputEmail">Email</label>
<div class="controls">
<input type="text" required ng-model="loginModel.email" id="inputEmail" placeholder="Email">
</div>
</div>
<div class="control-group">
<label class="control-label" for="inputPassword">Password</label>
<div class="controls">
<input type="password" required ng-model="loginModel.password" id="inputPassword" placeholder="Password">
</div>
</div>
<div class="control-group">
<div class="controls">
<label class="checkbox">
<input type="checkbox" ng-model="loginModel.remember" ng-checked="login.remember"> Remember me
</label>
</div>
</div>
</div>
<div class="span4">
<button type="submit" ng-click="login()" class="btn btn-success btn-large">
<i class="icon-lock"></i>
<div class="login-inner-box">
<form name="loginForm">
<input type="text" required ng-model="loginModel.email" id="inputEmail" placeholder="Email">
<input type="password" required ng-model="loginModel.password" id="inputPassword" placeholder="Password">
<label class="checkbox">
<input type="checkbox" ng-model="loginModel.remember" ng-checked="login.remember"> Remember me
</label>
<button type="submit" ng-click="login()" class="btn btn-success" style="margin-bottom: 20px">
Sign in
</button>
</div>
</div>
</form>
<div class="alert alert-error" ng-show="loginError">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>Login failed:</strong> {{loginError}}
......@@ -51,11 +37,8 @@
</a>
</div>
</form>
<div class="register-box text-center">
<h3>If you do not already have an account<h3>
</a> <a href="/register" class="btn btn-info btn-large">Sign up now!</a>
<div class="register-box text-center">
<a href="/register" class="btn btn-info">Sign up now!</a>
</div>
</div>
......
......@@ -69,18 +69,39 @@
}
}
.login-box {
width: 700px;
margin: 100px auto 0 auto;
.login-inner-box {
width: 50%;
float: left;
margin-left: 25%;
margin-right: 25%;
input, .btn {
margin-bottom: 10px;
width: 100%;
font-size: 1.2em;
box-sizing: border-box;
}
input[type=text], input[type=password] {
padding: 17px;
}
button.btn {
margin-top: 19px;
padding: 12px 30px;
input[type=checkbox] {
width: auto;
}
}
.login-box {
width: 700px;
margin: 100px auto 0 auto;
}
.login-box-logo {
text-align: center;
padding-bottom: 50px;
}
.register-box {
margin-top: 100px;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment