Commit 66040af53e5e8a3d87ff3d06bf112418316bce23
Exists in
develop
Merge branch 'master' into 'develop'
Master(benjamin) See merge request !54
Showing
3 changed files
Show diff stats
src/app/modules/opcion-pedido/opcion-pedido.component.html
src/app/modules/pedidos-salientes/pedidos-salientes.component.html
| ... | ... | @@ -9,7 +9,7 @@ |
| 9 | 9 | </div> |
| 10 | 10 | </div> |
| 11 | 11 | <div class="row mt-n5 mx-0 justify-content-around h-75"> |
| 12 | - <div class="col-5 col-md-6 col-lg-3 h-100"> | |
| 12 | + <div class="col-5 col-md-6 col-lg-4 h-100"> | |
| 13 | 13 | <div class="p-3 bg-white text-center shadow-lg rounded h-100"> |
| 14 | 14 | <h5 class="pt-3">ESTAMOS</h5> |
| 15 | 15 | <h3 class="font-weight-bold text-secondary">preparando</h3> |
| ... | ... | @@ -18,16 +18,16 @@ |
| 18 | 18 | *ngFor="let pedido of pedidosPendientes; let i = index" |
| 19 | 19 | [hidden]="i > 3" |
| 20 | 20 | class="font-weight-bold mb-2 text-muted"> |
| 21 | - <h1 class="display-4">{{rellenar(pedido.id.toString().slice(1), 3)}}</h1> | |
| 21 | + <h1 class="display-4">{{rellenar(pedido.id.toString().slice(0), 3)}}</h1> | |
| 22 | 22 | </div> |
| 23 | 23 | </div> |
| 24 | 24 | </div> |
| 25 | - <div class="col-5 col-md-6 col-lg-3 h-100"> | |
| 25 | + <div class="col-5 col-md-6 col-lg-4 h-100"> | |
| 26 | 26 | <div class="p-3 bg-white shadow-lg rounded text-center h-100"> |
| 27 | 27 | <h5 class="pt-3">LISTO PARA</h5> |
| 28 | 28 | <h3 class="font-weight-bold text-primary">retirar</h3> |
| 29 | 29 | <div *ngIf="pedidoFinalizado.length"> |
| 30 | - <h1 class="display-1 mt-4 text-primary mb-0">{{rellenar(pedidoFinalizado[0].id.toString().slice(1), 3)}}</h1> | |
| 30 | + <h1 class="display-1 mt-4 text-primary mb-0">{{rellenar(pedidoFinalizado[0].id.toString().slice(0), 3)}}</h1> | |
| 31 | 31 | <hr class="line mt-0"> |
| 32 | 32 | </div> |
| 33 | 33 | <h3 class="font-weight-bold text-info mt-4">¡Que lo disfrutes!</h3> |
src/app/modules/seleccion-articulos/seleccion-articulos.component.html
| ... | ... | @@ -33,12 +33,12 @@ |
| 33 | 33 | <!-- CATEGORIAS --> |
| 34 | 34 | <div |
| 35 | 35 | #templateCategorias |
| 36 | - class="col-12 px-0 box-categorias border border-primary py-1 | |
| 36 | + class="col-12 px-0 mx-0 box-categorias border border-primary py-1 | |
| 37 | 37 | border-left-0 rounded-right scroll-y cat-box" |
| 38 | 38 | (scroll)="scrollEvent($event)"> |
| 39 | 39 | <div |
| 40 | - class="row mx-4 mb-2 h-25 h-md-32 h-lg-45 justify-content-center tab cat-content" | |
| 41 | - [ngClass]="{ 'active rounded-sm shadow': allActive, 'border-bottom-effect': !allActive, | |
| 40 | + class="row mx-2 mb-2 h-25 h-md-32 h-lg-45 justify-content-center tab cat-content" | |
| 41 | + [ngClass]="{ 'active rounded shadow px-2': allActive, 'border-bottom-effect': !allActive, | |
| 42 | 42 | 'media-pantalla' : boxCarrito.classList.contains('media-pantalla') }" |
| 43 | 43 | (click)="selectCategoria(-1, 0)"> |
| 44 | 44 | <img |
| ... | ... | @@ -50,8 +50,8 @@ |
| 50 | 50 | <small class="col-12 px-0 my-1 h-100 h-md-25 align-self-end text-center text-truncate">Todos</small> |
| 51 | 51 | </div> |
| 52 | 52 | <div |
| 53 | - class="row mx-4 mb-2 h-25 h-md-32 h-lg-45 justify-content-center tab cat-content" | |
| 54 | - [ngClass]="{ 'active rounded-sm shadow': categoria.selected, 'border-bottom-effect': !categoria.selected, | |
| 53 | + class="row mx-2 mb-2 h-25 h-md-32 h-lg-45 justify-content-center tab cat-content" | |
| 54 | + [ngClass]="{ 'active rounded shadow px-2': categoria.selected, 'border-bottom-effect': !categoria.selected, | |
| 55 | 55 | 'media-pantalla' : boxCarrito.classList.contains('media-pantalla') }" |
| 56 | 56 | (click)="selectCategoria(i, categoria.id)" |
| 57 | 57 | *ngFor="let categoria of categorias; let i = index;"> |