Martin Macola / autoservicio

Download as
Browse Code »

Commit 92b76c47027b01cae95eabc7f45efbc8b4f80f15

Authored by Eric Fernandez
2 parents 3fa5b2492d 6544f80bf6
Exists in master

Merge branch 'master' into 'master' 

Master(mpuebla)

See merge request !89
Showing 5 changed files   Show diff stats
src/app/components/confirmacion-carrito/confirmacion-carrito.component.html
Diff comments   View file @ 92b76c4
... ... @@ -163,7 +163,7 @@
163 163 <div class="col-5 my-auto p-0">
164 164 <img
165 165 src="{{apiImagenes}}/imagenes/efectivo.png"
166   - class="w-50 float-right mr-3">
  166 + class="w-100 float-right">
167 167 </div>
168 168 </div>
169 169  
src/app/components/home/home.component.html
Diff comments   View file @ 92b76c4
... ... @@ -17,7 +17,7 @@
17 17  
18 18 <!-- INFO DE BIENVENIDA -->
19 19 <div class="row my-auto mx-0 h-75 w-100">
20   - <div class="col-8 col-lg-8 my-auto">
  20 + <div class="col-6 col-lg-8 my-auto p-3 h-100">
21 21 <div class="embed-responsive embed-responsive-16by9">
22 22 <iframe
23 23 class="embed-responsive-item rounded fade-in"
... ... @@ -25,7 +25,7 @@
25 25 </iframe>
26 26 </div>
27 27 </div>
28   - <div class="col-8 col-lg-4 text-center text-white my-auto">
  28 + <div class="col-6 col-lg-4 text-center text-white my-auto">
29 29 <p class="display-4 font-weight-bold m-0">¡BIENVENIDO!</p>
30 30 <p class="display-4 m-0 font-weight-bold">Toque la pantalla<br>para comenzar</p>
31 31 </div>
src/app/components/inicio/inicio.component.html
Diff comments   View file @ 92b76c4
... ... @@ -4,12 +4,12 @@
4 4 <!-- NOMBRE DE SECCION -->
5 5 <div class="row m-0">
6 6 <div class="col-12 p-0">
7   - <p class="h5 py-1 bg-gray text-muted text-center">Inicio</p>
  7 + <p class="h5 m-0 py-1 bg-gray text-muted text-center">Inicio</p>
8 8 </div>
9 9 </div>
10 10  
11   - <div class="row m-3 d-flex align-items-start disable-user-select">
12   - <div class="col-md-5 d-flex align-items-end flex-column">
  11 + <div class="row m-0 d-flex align-items-start disable-user-select">
  12 + <div class="col-md-5 py-3 pr-0 d-flex align-items-end flex-column">
13 13  
14 14 <!-- PROMOCIONES -->
15 15 <div
... ... @@ -18,10 +18,10 @@
18 18 <div class="card-body text-left px-4 py-3">
19 19 <div class="row">
20 20 <div class="col-auto">
21   - <p class="h3 card-title">Promociones</p>
  21 + <p class="m-0 h3 card-title">Promociones</p>
22 22 </div>
23 23 <div class="col-auto p-0">
24   - <img src="{{apiImagenes}}/imagenes/primario.promociones.png" class="icon-dim m-0">
  24 + <img src="{{apiImagenes}}/imagenes/primario.promociones.png" class="w-15 m-0">
25 25 </div>
26 26 </div>
27 27 <p class="h5 card-text text-muted font-weight-light">Conozca las ofertas del momento.</p>
... ... @@ -53,14 +53,14 @@
53 53  
54 54 <!-- ORDENAR -->
55 55 <div (click)="irBusquedaProductos('ordenar')"
56   - class="card card-effect bg-white border-0 shadow rounded w-100 mt-4">
  56 + class="card card-effect bg-white border-0 shadow rounded w-100 mt-3">
57 57 <div class="card-body text-left px-4 py-3">
58 58 <div class="row">
59 59 <div class="col-auto">
60   - <p class="h3 card-title">Ordenar Pedido</p>
  60 + <p class="m-0 h3 card-title">Ordenar Pedido</p>
61 61 </div>
62 62 <div class="col-auto p-0">
63   - <img src="{{apiImagenes}}/imagenes/primario.ordenar.png" class="icon-dim">
  63 + <img src="{{apiImagenes}}/imagenes/primario.ordenar.png" class="w-15">
64 64 </div>
65 65 </div>
66 66 <p class="h5 card-text text-muted font-weight-light">Arme su pedido y solo pase a retirar.</p>
... ... @@ -71,7 +71,7 @@
71 71 </div>
72 72 </div>
73 73  
74   - <div class="col-md-7 d-flex align-items-end flex-column mt-4 mt-md-0">
  74 + <div class="col-md-7 py-3 d-flex align-items-end flex-column mt-4 mt-md-0">
75 75  
76 76 <!-- CARGAR PRODUCTOS -->
77 77 <ng-template #popTemplate>
... ... @@ -100,10 +100,10 @@
100 100 <div class="card-body text-left px-4 py-3">
101 101 <div class="row">
102 102 <div class="col-auto">
103   - <p class="h3 card-title">Cargar Productos</p>
  103 + <p class="m-0 h3 card-title">Cargar Productos</p>
104 104 </div>
105 105 <div class="col-auto p-0">
106   - <img src="{{apiImagenes}}/imagenes/escanear.png" class="icon-dim mb-2">
  106 + <img src="{{apiImagenes}}/imagenes/escanear.png" class="w-15">
107 107 </div>
108 108 </div>
109 109 <p class="h5 card-text text-muted font-weight-light">
... ... @@ -111,7 +111,7 @@
111 111 al lector de códigos o selecciónelo en pantalla.
112 112 </p>
113 113 </div>
114   - <div class="row m-4">
  114 + <div class="row mx-3 mb-3">
115 115 <div class="col card bg-white shadow border-0 w-75 p-0 mx-auto rounded-sm">
116 116 <!-- IMAGEN DE ESCANER -->
117 117 <img
... ... @@ -185,17 +185,17 @@
185 185  
186 186 <!-- BUSCAR PRODUCTOS -->
187 187 <div (click)="irBusquedaProductos('todos')"
188   - class="card card-effect bg-white border-0 shadow rounded w-100 mt-4">
  188 + class="card card-effect bg-white border-0 shadow rounded w-100 mt-3">
189 189 <div class="card-body text-left px-4 py-3">
190 190 <div class="row">
191 191 <div class="col-auto">
192   - <p class="h3 card-title">Buscar Productos</p>
  192 + <p class="m-0 h3 card-title">Buscar Productos</p>
193 193 <p class="h5 card-text text-muted font-weight-light">
194 194 Busque aquí los productos<br>
195 195 que no tienen código.</p>
196 196 </div>
197 197 <div class="col-auto p-0">
198   - <img src="{{apiImagenes}}/imagenes/primario.buscar.png" class="icon-dim mb-2">
  198 + <img src="{{apiImagenes}}/imagenes/primario.buscar.png" class="w-15">
199 199 </div>
200 200 </div>
201 201  
src/app/components/master/master.component.html
Diff comments   View file @ 92b76c4
1   -<div
2   - class="row m-0 fade-in"
3   - (click)="reiniciarTimer">
4   - <div class="col-10 p-0 vh-100">
5   -
6   - <!-- TOP HEADER -->
7   - <app-header></app-header>
8   -
9   - <router-outlet></router-outlet>
  1 +<div class="container-fluid m-0 p-0">
10 2  
11   - </div>
  3 + <div class="row m-0 fade-in" (click)="reiniciarTimer">
  4 + <div class="col-10 p-0 vh-100">
  5 +
  6 + <!-- TOP HEADER -->
  7 + <app-header></app-header>
  8 +
  9 + <router-outlet></router-outlet>
12 10  
13   - <!-- SIDEBAR -->
14   - <app-sidebar class="sidebar position-fixed float-right col-2 col-md-2 vh-100 bg-primary-gradient px-1 pt-2">
15   - </app-sidebar>
  11 + </div>
  12 +
  13 + <!-- SIDEBAR -->
  14 + <app-sidebar
  15 + class="sidebar position-fixed float-right col-2 col-md-2 vh-100 bg-primary-gradient px-1 pt-2">
  16 + </app-sidebar>
  17 + </div>
16 18  
17 19 </div>
... ... @@ -5,11 +5,7 @@
5 5 html,
6 6 body {
7 7 height: 100%;
8   - background: linear-gradient(
9   - 0deg,
10   - #e6e6e6,
11   - #fff
12   - );
  8 + background: linear-gradient(0deg, #e6e6e6, #fff);
13 9 font-family: bahnschrift;
14 10 overflow: hidden !important;
15 11 }
... ... @@ -183,4 +179,4 @@ body {
183 179  
184 180 .w-15 {
185 181 width: 15% !important;
186   -}
187 182 \ No newline at end of file
  183 +}