Skip to content

yotta / pictogram

Go to a project
Commit 7d92e753 by Arturo Montejo Ráez
Options

login page redesigned

parent 7af1c13b
Inline Side-by-side
Showing with 50 additions and 26 deletions
sails/src/assets/scripts/modules/login/views/login.html
<div class="row"> <div class="row">
<div class="col-md-12 text-center">
<!-- Logo Pictogram
<p>
<img src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram" />
</p>
-->
<p>&nbsp;</p>
<p class="text-center">
<img ng-src="{{office.logoUrl}}" alt="{{office.name}}" title="{{office.name}}">
</p>
</div>
</div>
<div class="row">
<!-- Rejilla 3 elementos de igual ancho --> <!-- Rejilla 3 elementos de igual ancho -->
<div class="col-md-4">&nbsp;</div> <div class="col-md-2">&nbsp;</div>
<div class="col-md-4"> <div class="col-md-4">
<div id="login"> <div id="login">
<!-- Logo Pictogram
<p>
<img src="img/logo_pictogram.png" alt="Pictogram" title="Pictogram" />
</p>
-->
<p class="text-center">
<img ng-src="{{office.logoUrl}}" alt="{{office.name}}" title="{{office.name}}">
</p>
<!-- Formulario --> <!-- Formulario -->
<!-- LoginCtrl controls here, see app.js --> <!-- LoginCtrl controls here, see app.js -->
<form name="loginForm" ng-submit="login()" novalidate> <form name="loginForm" ng-submit="login()" novalidate>
<div class="form-group"> <div class="form-group">
<label translate>email</label>:
<input type="email" class="form-control" id="login_email" placeholder="{{ 'your_email' | translate}}" required ng-model="credentials.email" /> <input type="email" class="form-control" id="login_email" placeholder="{{ 'your_email' | translate}}" required ng-model="credentials.email" />
</div> </div>
<div class="form-group"> <div class="form-group">
<label translate>password</label>:
<input type="password" class="form-control" id="login_password" placeholder="{{ 'your_password' | translate}}" required ng-model="credentials.password" /> <input type="password" class="form-control" id="login_password" placeholder="{{ 'your_password' | translate}}" required ng-model="credentials.password" />
</div> </div>
<div class="checkbox"> <div class="checkbox">
...@@ -28,23 +34,32 @@ ...@@ -28,23 +34,32 @@
<input type="checkbox" id="login_savepassword" ng-model="credentials.savepassword" />{{ 'remember' | translate }} <input type="checkbox" id="login_savepassword" ng-model="credentials.savepassword" />{{ 'remember' | translate }}
</label> </label>
</div> </div>
<p class="text-center"> <div class="row">
<button type="submit" class="btn btn-primary" translate>login</button> <div class="col-md-12">
</p> <div class="pull-left">
<p class="text-center"> <button type="submit" class="btn btn-primary" translate>login</button>
<i ng-class="{'fa fa-spinner fa-spin fa-2x fa-fw margin-bottom': true, 'spin_disabled': !submitted}"></i> </div>
</p> <div class="pull-left">
<p class="text-center"> <i ng-class="{'fa fa-spinner fa-spin fa-2x fa-fw margin-bottom': true, 'spin_disabled': !submitted}"></i>
<a href="/app/#/signin" translate>create_an_account</a> </div>
</p> <div class="pull-right margin-top7">
<p class="text-center"> <a href="/app/#/signin" translate>create_an_account</a>
</div>
</div>
</div>
<div class="text-center margin-top15">
<br/>
<a href="/app/#/changepass" translate>password_forgotten</a> <a href="/app/#/changepass" translate>password_forgotten</a>
</p> </div>
</form> </form>
</div> </div>
<!-- Fin login --> <!-- Fin login -->
</div> </div>
<div class="col-md-4">&nbsp;</div> <div class="col-md-4">
<img src="img/login.png" alt="Pictogram" title="Pictogram" />
</div>
<div class="col-md-2">&nbsp;</div>
</div> </div>
<!-- Fin de row --> <!-- Fin de row -->
......
sails/src/assets/styles/main.css
...@@ -51,6 +51,15 @@ ...@@ -51,6 +51,15 @@
margin-right: 10px; margin-right: 10px;
} }
.margin-top15 {
margin-top: 15px;
}
.margin-top7 {
margin-top: 7px;
}
/* Evitar scrolling horizontal */ /* Evitar scrolling horizontal */
body{ body{
overflow-x: hidden; overflow-x: hidden;
...@@ -101,11 +110,11 @@ legend{ padding-top: 20px; } ...@@ -101,11 +110,11 @@ legend{ padding-top: 20px; }
/* Estilos para el panel de login*/ /* Estilos para el panel de login*/
#login{ #login{
max-width: 300px; max-width: 300px;
margin: 60px auto; margin: 15px auto;
} }
#login form{ #login form{
margin-top: 30px; margin-top: 0px;
} }
/* Login: Pie de página con idiomas fijos siempre abajo ; */ /* Login: Pie de página con idiomas fijos siempre abajo ; */
...@@ -943,7 +952,7 @@ input[type=range]:focus::-ms-fill-upper { ...@@ -943,7 +952,7 @@ input[type=range]:focus::-ms-fill-upper {
/* Estilos para el panel de login*/ /* Estilos para el panel de login*/
#login{ #login{
margin-top: 100px; margin-top: 0px;
} }
/* Estilos para el panel de signin (registro) */ /* Estilos para el panel de signin (registro) */
......
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 sign in to comment