Commit e9a8dc27cd20be077e89131d01ec2eb0c9915b90
Exists in
develop
Merge branch 'develop' of git.focasoftware.com:angular/autoservicio-axion
Showing
2 changed files
Show diff stats
src/app/modules/mensaje-final/mensaje-final.component.html
| ... | ... | @@ -49,27 +49,17 @@ |
| 49 | 49 | </p> |
| 50 | 50 | </div> |
| 51 | 51 | </div> |
| 52 | - <div class="row justify-content-center"> | |
| 53 | - <div class="col-5"> | |
| 54 | - <div class="row justify-content-between"> | |
| 55 | - <div class="col-12"> | |
| 56 | - <div | |
| 57 | - class="d-inline-block py-1 btn-effect bg-primary badge-pill text-white" | |
| 58 | - (click)="goToSplash()"> | |
| 59 | - <div class="row mx-0 bg-primary badge-pill heigth-80"> | |
| 60 | - <div class="col-10 align-self-center text-center text-white h3">finalizar</div> | |
| 61 | - <div class="col-2 align-self-center p-0"> | |
| 62 | - <img | |
| 63 | - draggable="false" | |
| 64 | - ondragstart="return false;" | |
| 65 | - (contextmenu)="false" | |
| 66 | - class="icon-50" | |
| 67 | - src="assets/img/ir.svg"> | |
| 68 | - </div> | |
| 69 | - </div> | |
| 70 | - </div> | |
| 71 | - </div> | |
| 72 | - </div> | |
| 52 | + <div class="row mx-0 justify-content-center"> | |
| 53 | + <div | |
| 54 | + class="col-5 py-3 btn-effect bg-primary badge-pill text-white text-center" | |
| 55 | + (click)="goToSplash()"> | |
| 56 | + <span class="h3 m-0">Finalizar</span> | |
| 57 | + <img | |
| 58 | + draggable="false" | |
| 59 | + ondragstart="return false;" | |
| 60 | + (contextmenu)="false" | |
| 61 | + class="float-right icon-40" | |
| 62 | + src="assets/img/ir.svg"> | |
| 73 | 63 | </div> |
| 74 | 64 | </div> |
| 75 | 65 | </div> |
src/app/modules/seleccion-articulos/seleccion-articulos.component.html
| ... | ... | @@ -166,9 +166,9 @@ |
| 166 | 166 | |
| 167 | 167 | <!-- VER CARRITO --> |
| 168 | 168 | <div |
| 169 | - class="col-auto px-0 mt-3 h-20" | |
| 169 | + class="col-auto px-0 h-20" | |
| 170 | 170 | *ngIf="articuloService.carrito.length" |
| 171 | - [ngClass]="{'ml-auto pb-3' : boxCarrito.classList.contains('media-pantalla')}"> | |
| 171 | + [ngClass]="boxCarrito.classList.contains('media-pantalla') ? 'ml-auto' : 'mt-3'"> | |
| 172 | 172 | <div |
| 173 | 173 | class="btn-effect col-auto px-0 align-self-center bg-white" |
| 174 | 174 | [routerLink]="['/carrito']"> |