Commit d1da6b40b7a2612d9cd56bf3419219d492740566

Authored by Eric Fernandez
Exists in master

Merge branch 'master' into 'master'

Master(mpuebla)

See merge request !112
src/app/components/busqueda-productos/busqueda-productos.component.html
... ... @@ -69,14 +69,16 @@
69 69 </div>
70 70 </div>
71 71 <!-- LISTA DE PRODUCTOS -->
72   - <div class="row m-0 align-items-start vh-70 overflow-scroll disable-user-select">
  72 + <div class="row m-0 align-items-start vh-60 overflow-scroll disable-user-select">
73 73 <div
74 74 class="col-4 col-lg-3 p-2"
75 75 *ngFor="let producto of auxProductos">
76 76 <div
77 77 class="card-effect bg-white rounded-sm shadow border-0"
78 78 (click)="elegirProducto(producto)">
79   - <img src="{{apiImagenes}}/imagenes/{{producto.imagenes[0].imagen}}" class="rounded-sm w-100 m-auto">
  79 + <img
  80 + src="{{apiImagenes}}/imagenes/{{producto.imagenes[0].imagen}}"
  81 + class="rounded-sm shadow w-100 m-auto">
80 82 <div class="p-2">
81 83 <p class="h6 min-h-40 text-left m-0"><small>{{producto.DET_LAR}}</small></p>
82 84 <div class="row m-0">
src/app/components/header/header.component.html
1   -<div class="row m-0 bg-light p-4 justify-content-between">
  1 +<div class="row m-0 bg-light p-3 justify-content-between">
2 2 <div class="col-6">
3 3 <img class="w-25 float-left" src="{{apiImagenes}}/imagenes/logoempresa.png">
4 4 </div>
src/app/components/home/home.component.html
... ... @@ -7,16 +7,16 @@
7 7 [routerLink]="['/inicio']">
8 8  
9 9 <!-- HEADER -->
10   - <div class="vh-15 d-flex flex-row flex-wrap m-0 w-100 bg-primary-gradient-horizontal">
  10 + <div class="vh-15 row m-0 flex-row w-100 bg-primary-gradient-horizontal">
11 11 <div class="h-100 w-50 bg-white rounded-bottom-right">
12 12 <img class="h-100 p-2 m-auto d-block" src="{{apiImagenes}}/imagenes/logoempresa.png">
13 13 </div>
14 14 </div>
15 15  
16 16 <!-- INFO DE BIENVENIDA -->
17   - <div class="d-flex h-50 flex-row flex-wrap justify-content-around align-items-center w-100 m-3">
  17 + <div class="h-50 row flex-row justify-content-around align-items-center w-100 m-3">
18 18 <iframe
19   - class="w-50 h-100 rounded fade-in"
  19 + class="w-50 h-100 border-0 rounded fade-in"
20 20 src="https://www.youtube.com/embed/vb8ZcalBDyw?&autoplay=1&loop=1&playlist=vb8ZcalBDyw&controls=0&showinfo=0&mute=1">
21 21 </iframe>
22 22 <div class="w-auto text-center text-white">
... ... @@ -26,7 +26,7 @@
26 26 </div>
27 27  
28 28 <!-- FOOTER -->
29   - <div class="vh-15 d-flex flex-row-reverse flex-wrap w-100 bg-gray">
  29 + <div class="vh-15 row m-0 flex-row-reverse w-100 bg-gray">
30 30 <div class="h-100 w-50 bg-white rounded-top-left">
31 31 <img class="h-100 p-2 m-auto d-block" src="{{apiImagenes}}/imagenes/logodebo.png">
32 32 </div>
src/app/components/inicio/inicio.component.html
... ... @@ -122,7 +122,7 @@
122 122 <!-- PRODUCTO A CARGAR -->
123 123 <div class="fade-in m-0" *ngIf="productoAcargar && !promoAcargar">
124 124 <img
125   - class="card-img-top d-block w-75 mx-auto rounded-sm"
  125 + class="card-img-top d-block w-75 shadow mx-auto rounded-sm"
126 126 src="{{apiImagenes}}/imagenes/{{productoAcargar.imagenes[0].imagen}}">
127 127  
128 128 <div class="row justify-content-between m-3">
src/app/components/master/master.component.html
1 1 <div class="container-fluid m-0 p-0">
2 2  
3   - <div class="row m-0 fade-in" (click)="reiniciarTimer">
  3 + <div class="row m-0 fade-in" (click)="reiniciarTimer()">
4 4 <div class="col-10 p-0 vh-100">
5 5  
6 6 <!-- TOP HEADER -->