Commit 128d72e676cb6b85e91e450ff10f5c15e2def8fa
1 parent
3245ee82c2
Exists in
master
Merge conflicts
Showing
1 changed file
with
6 additions
and
29 deletions
Show diff stats
src/views/foca-login.html
| 1 | -<img src="img/logo.png" class="w-25 rounded mx-auto d-block"> | |
| 2 | -<div class="login mt-5 p-3 border-0"> | |
| 3 | - <form name="login"> | |
| 4 | - | |
| 5 | - <div class="login-titulo"> | |
| 6 | - <span>Ingreso de usuario</span> | |
| 1 | +<div class="row mt-5 overflow-hidden"> | |
| 2 | + <div class="col p-0"> | |
| 3 | + <div class="row mt-5 justify-content-center"> | |
| 4 | + <div class="col-auto p-0"> | |
| 5 | + <img src="./img/logofoca.png" alt="Debo Logo"> | |
| 6 | + </div> | |
| 7 | 7 | </div> |
| 8 | 8 | |
| 9 | 9 | <div class="row justify-content-center m-5"> |
| ... | ... | @@ -58,28 +58,5 @@ |
| 58 | 58 | </form> |
| 59 | 59 | </div> |
| 60 | 60 | </div> |
| 61 | -<<<<<<< HEAD | |
| 62 | - <div class="login-campo"> | |
| 63 | - <label>Contraseña</label> | |
| 64 | - <input | |
| 65 | - id = "password" | |
| 66 | - type = "password" | |
| 67 | - ng-model = "usuario.clave" | |
| 68 | - foca-focus = "paso == 2" | |
| 69 | - ng-keyup = "$event.keyCode == 13 && enviar()" | |
| 70 | - ladda = "loginLoading" | |
| 71 | - teclado-virtual | |
| 72 | - /> | |
| 73 | - </div> | |
| 74 | - <button | |
| 75 | - type="button" | |
| 76 | - ng-click="enviar()" | |
| 77 | - class="login-button btn mt-3 btn-login" | |
| 78 | - ladda="loginLoading" | |
| 79 | - >Ingresar</button> | |
| 80 | - </form> | |
| 81 | - <img src="img/logo-foca.png" class="w-50 rounded mx-auto d-block"> | |
| 82 | -======= | |
| 83 | 61 | </div> |
| 84 | ->>>>>>> ac450d6b074c59434f538a88b6166436bff55510 | |
| 85 | 62 | </div> |