Commit b1c13105 authored by Taisiya Glushko's avatar Taisiya Glushko
Browse files

registration-login-column-width-fixes

parent 7972af8a
......@@ -737,7 +737,7 @@ $light-font-family: 'Roboto-Light';
box-shadow: none;
border-radius: 0;
font-family: $emphasis-font-family;
color: #bbbbbb;
color: #000000;
font-size: 18px;
@include placeholder {
font-family: $emphasis-font-family;
......
......@@ -19,21 +19,21 @@
<form role="form" method="POST" action="<c:url value="/login-attempt" />" class="form-horizontal row">
<div class="form-group">
<label for="j_username" class="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label"><spring:message code="login.username"/></label>
<label for="j_username" class="col-lg-2 col-md-3 col-sm-3 col-xs-12 control-label"><spring:message code="login.username"/></label>
<div class="col-lg-4 col-md-4 col-sm-5 col-xs-12">
<input type="text" id="j_username" name="username" class="form-control grabfocus" autofocus="autofocus" />
</div>
</div>
<div class="form-group">
<label for="j_password" class="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label"><spring:message code="login.password"/></label>
<label for="j_password" class="col-lg-2 col-md-3 col-sm-3 col-xs-12 control-label"><spring:message code="login.password"/></label>
<div class="col-lg-4 col-md-4 col-sm-5 col-xs-12">
<input type="password" id="j_password" name="password" class="form-control" />
</div>
</div>
<div class="form-group">
<div class="col-lg-offset-2 col-lg-4 col-md-offset-2 col-md-4 col-sm-offset-2 col-sm-4 col-xs-12 checkbox">
<div class="col-lg-offset-2 col-lg-4 col-md-offset-3 col-md-4 col-sm-offset-3 col-sm-4 col-xs-12 checkbox">
<label class="control-label" for='_spring_security_remember_me'>
<input type='checkbox' name='_spring_security_remember_me' id='_spring_security_remember_me'/>
<spring:message code="login.remember-me"/>
......@@ -41,7 +41,7 @@
</div>
</div>
<div class="form-group transparent">
<div class="col-lg-offset-2 col-lg-10 col-md-offset-2 col-md-10 col-sm-offset-2 col-sm-12 col-xs-12">
<div class="col-lg-offset-2 col-lg-10 col-md-offset-3 col-md-9 col-sm-offset-3 col-sm-9 col-xs-12">
<input type="submit" value="<spring:message code="login.login-button" />" class="btn btn-primary" />
<a href="<c:url value="/google/login" />" class="btn btn-default google-signin"><spring:message code="login.with-google-plus"/></a>
<a href="registration" id="registration" class="btn btn-default"><spring:message code="login.register-now"/></a>
......
......@@ -28,13 +28,13 @@
<form:form method="POST" action="/registration" cssClass="form-horizontal validate row" modelAttribute="user">
<div class="form-group">
<form:label for="email" cssClass="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label" path="email">
<form:label for="email" cssClass="col-lg-2 col-md-3 col-sm-3 col-xs-12 control-label" path="email">
<spring:message code="registration.email" />
</form:label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12">
<div class="col-lg-10 col-md-9 col-sm-9 col-xs-12">
<form:input id="email" name="email" cssClass="span3 required email form-control" path="email"/>
</div>
<div class="col-lg-offset-2 col-lg-4 col-md-offset-2 col-md-4 col-sm-offset-2 col-sm-4 col-xs-12">
<div class="col-lg-offset-2 col-lg-4 col-md-offset-3 col-md-4 col-sm-offset-3 col-sm-4 col-xs-12">
<spring:bind path="email">
<c:if test="${status.error}">
<gui:alert type="danger">
......@@ -45,13 +45,13 @@
</div>
</div>
<div class="form-group">
<form:label for="password" cssClass="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label" path="password">
<form:label for="password" cssClass="col-lg-2 col-md-3 col-sm-3 col-xs-12 control-label" path="password">
<spring:message code="registration.password" />
</form:label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12">
<div class="col-lg-10 col-md-9 col-sm-9 col-xs-12">
<form:password id="password" name="password" cssClass="span3 required form-control" path="password"/>
</div>
<div class="col-lg-offset-2 col-lg-4 col-md-offset-2 col-md-4 col-sm-offset-2 col-sm-4 col-xs-12">
<div class="col-lg-offset-2 col-lg-4 col-md-offset-3 col-md-4 col-sm-offset-3 col-sm-4 col-xs-12">
<spring:bind path="password">
<c:if test="${status.error}">
<gui:alert type="danger">
......@@ -66,26 +66,26 @@
</div>
</div>
<div class="form-group">
<label for="confirm_password" class="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label">
<label for="confirm_password" class="col-lg-2 col-md-3 col-sm-3 col-xs-12 control-label">
<spring:message code="registration.confirm-password" />
</label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12">
<div class="col-lg-10 col-md-9 col-sm-9 col-xs-12">
<input type="password" id="confirm_password" name="confirm_password" class="span3 required form-control" equalTo="#password" />
</div>
<div class="col-lg-offset-2 col-lg-4 col-md-offset-2 col-md-4 col-sm-offset-2 col-sm-4 col-xs-12">
<div class="col-lg-offset-2 col-lg-4 col-md-offset-3 col-md-4 col-sm-offset-3 col-sm-4 col-xs-12">
<gui:alert type="danger" display="${not empty passwordRepeatError}">
<spring:message code="${passwordRepeatError}" />
</gui:alert>
</div>
</div>
<div class="form-group">
<form:label for="name" cssClass="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label" path="name">
<form:label for="name" cssClass="col-lg-2 col-md-3 col-sm-3 col-xs-12 control-label" path="name">
<spring:message code="registration.full-name" />
</form:label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12">
<div class="col-lg-10 col-md-9 col-sm-9 col-xs-12">
<form:input id="name" name="name" cssClass="span3 required form-control" path="name"/>
</div>
<div class="col-lg-offset-2 col-lg-4 col-md-offset-2 col-md-4 col-sm-offset-2 col-sm-4 col-xs-12">
<div class="col-lg-offset-2 col-lg-4 col-md-offset-3 col-md-4 col-sm-offset-3 col-sm-4 col-xs-12">
<spring:bind path="name">
<c:if test="${status.error}">
<gui:alert type="danger">
......@@ -96,18 +96,18 @@
</div>
</div>
<div class="form-group">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label"><spring:message code="captcha.text" /></label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12">
<label class="col-lg-2 col-md-3 col-sm-3 col-xs-12 control-label"><spring:message code="captcha.text" /></label>
<div class="col-lg-10 col-md-9 col-sm-9 col-xs-12">
<local:captcha siteKey="${captchaSiteKey}" />
</div>
<div class="col-lg-offset-2 col-lg-4 col-md-offset-2 col-md-4 col-sm-offset-2 col-sm-4 col-xs-12">
<div class="col-lg-offset-2 col-lg-4 col-md-offset-3 col-md-4 col-sm-offset-3 col-sm-4 col-xs-12">
<gui:alert type="danger" display="${not empty captchaError}">
<spring:message code="${captchaError}" />
</gui:alert>
</div>
</div>
<div class="form-group transparent">
<div class="col-lg-offset-2 col-lg-10 col-md-offset-2 col-md-10 col-sm-offset-2 col-sm-10 col-xs-12">
<div class="col-lg-offset-2 col-lg-10 col-md-offset-3 col-md-10 col-sm-offset-3 col-sm-10 col-xs-12">
<form:button class="btn btn-primary col-lg-2 col-md-2 col-sm-2 col-xs-12">
<spring:message code="registration.create-account" />
</form:button>
......
......@@ -19,15 +19,15 @@
<form class="form-horizontal row" action="<c:url value="/profile/password/reset"/>" method="post">
<div class="form-group">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label">
<label class="col-lg-2 col-md-3 col-sm-3 col-xs-12 control-label">
<spring:message code="captcha.text" />
</label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12">
<div class="col-lg-10 col-md-9 col-sm-9 col-xs-12">
<local:captcha siteKey="${captchaSiteKey}" />
</div>
</div>
<div class="form-group">
<label for="email" class="col-lg-2 col-md-2 col-sm-2 col-xs-12 control-label">
<label for="email" class="col-lg-2 col-md-3 col-sm-3 col-xs-12 control-label">
<spring:message code="userprofile.enter.email" />
</label>
<div class="col-lg-4 col-md-4 col-sm-5 col-xs-12">
......@@ -35,7 +35,7 @@
</div>
</div>
<div class="form-group transparent">
<div class="col-lg-offset-2 col-lg-10 col-md-offset-2 col-md-10 col-sm-offset-2 col-sm-10 col-xs-12">
<div class="col-lg-offset-2 col-lg-10 col-md-offset-3 col-md-9 col-sm-offset-3 col-sm-9 col-xs-12">
<input type="submit" value="<spring:message code="userprofile.email.send" />" class="btn btn-primary" />
</div>
</div>
......
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