Commit 8d198f050f4c45f96096658a44e5da587ec4a3ca

Authored by Marcelo Puebla
Exists in develop

Merge branch 'develop' into 'develop'

Develop

See merge request !161
src/app/modules/seleccion-articulos/filtro-categorias/filtro-categorias.component.html
... ... @@ -26,32 +26,31 @@
26 26 draggable="false"
27 27 ondragstart="return false;"
28 28 (contextmenu)="false"
29   - class="col-12 img-fluid align-self-end d-none
30   - d-sm-block rounded-circle h-50"
  29 + class="img-fluid align-self-end d-none d-sm-block rounded-circle h-100 h-md-70"
31 30 src="assets/img/logo-spot.svg">
32   - <small class="col-12 px-0 my-1 h-100 h-md-25 align-self-end text-center text-truncate">Todos</small>
  31 + <small class="col-12 px-0 my-1 h-100 h-md-20 align-self-end text-center text-truncate">Todos</small>
33 32 </div>
34   -
35   - <div
36   - class="row mx-2 mb-2 h-25 h-lg-30 justify-content-center tab cat-content"
37   - [ngClass]="{ 'active rounded shadow px-2': categoria.selected,
  33 + <div
  34 + class="row mx-2 mb-2 h-25 h-lg-30 justify-content-center tab cat-content"
  35 + [ngClass]="{
  36 + 'active rounded shadow px-2': categoria.selected,
38 37 'border-bottom-effect': !categoria.selected,
39   - 'media-pantalla': templateCategorias.classList.contains('media-pantalla')}"
40   - (click)="selectCategoria(i, categoria.id)"
41   - id="cat-content"
42   - *ngFor="let categoria of categorias; let i = index;"
43   - [hidden]="categoria.articulos <= 0
44   - || validarFecha(categoria.vigencia_desde, categoria.vigencia_hasta)">
45   - <img
  38 + 'media-pantalla': templateCategorias.classList.contains('media-pantalla')
  39 + }"
  40 + (click)="selectCategoria(i, categoria.id)"
  41 + id="cat-content"
  42 + *ngFor="let categoria of categorias; let i = index;"
  43 + [hidden]="categoria.articulos <= 0
  44 + || validarFecha(categoria.vigencia_desde, categoria.vigencia_hasta)">
  45 + <img
46 46 draggable="false"
47 47 ondragstart="return false;"
48 48 (contextmenu)="false"
49   - class="d-none d-sm-block rounded-circle w-auto h-auto col-12"
  49 + class="d-none d-sm-block rounded-circle w-auto h-100 h-md-70"
50 50 src="{{urlImagenes}}{{categoria.path_imagen}}"
51 51 onerror="this.src='assets/img/imagen-no-encontrada.jpg'">
52   - <small class="col-12 px-1 my-1 h-100 h-md-25 align-self-end text-center text-truncate">{{categoria.detalle}}</small>
53   - </div>
54   -
  52 + <small class="col-12 px-1 my-1 h-100 h-md-20 align-self-end text-center text-truncate">{{categoria.detalle}}</small>
  53 + </div>
55 54 </div>
56 55 <div class="col-auto btn-effect h-5 cat-btn">
57 56 <img