Merge branch 'master' into 'develop'

Master(benjamin) See merge request !78

Merge branch 'master' into 'develop'
Master(benjamin) See merge request !78
Marcelo Puebla
2 parents 98a3e512dd f9ea45223a
Showing 5 changed files Show diff stats
src/app/modules/carrito/carrito.component.html
src/app/modules/info-formas-pago/info-formas-pago.component.html
src/app/modules/mensaje-final/mensaje-final.component.html
src/app/modules/seleccion-articulos/seleccion-articulos.component.html
src/app/shared/footer/footer.component.html
@@ -80,9 +80,9 @@
     </div>
     <!-- TOTAL -->
     <div class="row mx-3 mt-2 h-auto justify-content-end">
-      <div class="col-auto align-self-center text-primary"><small>TOTAL</small></div>
-      <div class="col-auto px-3 bg-primary badge-pill">
-        <p class="text-center text-white py-1">{{articuloService.subTotal | currency}}</p>
+      <div class="col-auto font-weight-bold align-self-center text-primary py-2 h3">TOTAL</div>
+      <div class="col-auto align-self-center bg-primary badge-pill">
+        <p class="text-center font-weight-bold text-white py-2 h3 px-2">{{articuloService.subTotal | currency}}</p>
       </div>
     </div>
     <!-- CONTINUAR -->
@@ -65,7 +65,7 @@
       draggable="false"
       ondragstart="return false;"
       (contextmenu)="false"
-      class="align-self-center mt-4"
+      class="align-self-center icon-60 mt-4"
       src="assets/img/icono-cajero.svg">
     </div>
     <div class="modal-body text-center h1 mt-2 mb-4">
@@ -50,18 +50,25 @@
       </div>
     </div>
     <div class="row justify-content-center">
-      <div class="col-auto">
-        <div
-          class="d-inline-block w-100 py-1 btn-effect
-                bg-primary badge-pill text-white text-center"
-          (click)="goToSplash()">
-          <span class="px-4">FINALIZAR</span>
-          <img
-            draggable="false"
-            ondragstart="return false;"
-            (contextmenu)="false"
-            class="icon-30"
-            src="assets/img/ir.svg">
+      <div class="col-5">
+        <div class="row justify-content-between">
+          <div class="col-12">
+            <div
+              class="d-inline-block py-1 btn-effect bg-primary badge-pill text-white"
+              (click)="goToSplash()">
+              <div class="row mx-0 bg-primary badge-pill heigth-80">
+                <div class="col-10 align-self-center text-center text-white h3">finalizar</div>
+                <div class="col-2 align-self-center p-0">
+                  <img
+                  draggable="false"
+                  ondragstart="return false;"
+                  (contextmenu)="false"
+                  class="icon-50"
+                  src="assets/img/ir.svg">
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
     </div>
@@ -157,16 +157,16 @@
       <div
         class="col-auto mt-2 ml-auto h-20">
         <div class="row mx-0">
-          <div class="col-auto align-self-center text-primary">TOTAL</div>
-          <div class="col-auto bg-primary badge-pill">
-            <p class="text-center text-white mt-1 py-1">{{articuloService.subTotal | currency}}</p>
+          <div class="col-auto font-weight-bold align-self-center text-primary py-2 h3">TOTAL</div>
+          <div class="col-auto align-self-center bg-primary badge-pill">
+            <p class="text-center font-weight-bold text-white py-2 h3 px-2">{{articuloService.subTotal | currency}}</p>
           </div>
         </div>
       </div>
  
       <!-- VER CARRITO -->
       <div
-        class="col-auto px-0 mt-2 h-20"
+        class="col-auto px-0 mt-3 h-20"
         *ngIf="articuloService.carrito.length"
         [ngClass]="{'ml-auto pb-3' : boxCarrito.classList.contains('media-pantalla')}">
         <div
@@ -22,7 +22,7 @@
           draggable="false"
           ondragstart="return false;"
           (contextmenu)="false"
-          class="p-2 icon-40"
+          class="p-2 icon-60"
           src="assets/img/icono-volver.svg">
       </div>
     </div>
...	...	@@ -80,9 +80,9 @@
80	80	</div>
81	81	<!-- TOTAL -->
82	82	<div class="row mx-3 mt-2 h-auto justify-content-end">
83		- <div class="col-auto align-self-center text-primary"><small>TOTAL</small></div>
84		- <div class="col-auto px-3 bg-primary badge-pill">
85		- <p class="text-center text-white py-1">{{articuloService.subTotal \| currency}}</p>
	83	+ <div class="col-auto font-weight-bold align-self-center text-primary py-2 h3">TOTAL</div>
	84	+ <div class="col-auto align-self-center bg-primary badge-pill">
	85	+ <p class="text-center font-weight-bold text-white py-2 h3 px-2">{{articuloService.subTotal \| currency}}</p>
86	86	</div>
87	87	</div>
88	88	<!-- CONTINUAR -->
...	...	@@ -65,7 +65,7 @@
65	65	draggable="false"
66	66	ondragstart="return false;"
67	67	(contextmenu)="false"
68		- class="align-self-center mt-4"
	68	+ class="align-self-center icon-60 mt-4"
69	69	src="assets/img/icono-cajero.svg">
70	70	</div>
71	71	<div class="modal-body text-center h1 mt-2 mb-4">
...	...	@@ -50,18 +50,25 @@
50	50	</div>
51	51	</div>
52	52	<div class="row justify-content-center">
53		- <div class="col-auto">
54		- <div
55		- class="d-inline-block w-100 py-1 btn-effect
56		- bg-primary badge-pill text-white text-center"
57		- (click)="goToSplash()">
58		- <span class="px-4">FINALIZAR</span>
59		- <img
60		- draggable="false"
61		- ondragstart="return false;"
62		- (contextmenu)="false"
63		- class="icon-30"
64		- src="assets/img/ir.svg">
	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>
65	72	</div>
66	73	</div>
67	74	</div>
...	...	@@ -157,16 +157,16 @@
157	157	<div
158	158	class="col-auto mt-2 ml-auto h-20">
159	159	<div class="row mx-0">
160		- <div class="col-auto align-self-center text-primary">TOTAL</div>
161		- <div class="col-auto bg-primary badge-pill">
162		- <p class="text-center text-white mt-1 py-1">{{articuloService.subTotal \| currency}}</p>
	160	+ <div class="col-auto font-weight-bold align-self-center text-primary py-2 h3">TOTAL</div>
	161	+ <div class="col-auto align-self-center bg-primary badge-pill">
	162	+ <p class="text-center font-weight-bold text-white py-2 h3 px-2">{{articuloService.subTotal \| currency}}</p>
163	163	</div>
164	164	</div>
165	165	</div>
166	166
167	167	<!-- VER CARRITO -->
168	168	<div
169		- class="col-auto px-0 mt-2 h-20"
	169	+ class="col-auto px-0 mt-3 h-20"
170	170	*ngIf="articuloService.carrito.length"
171	171	[ngClass]="{'ml-auto pb-3' : boxCarrito.classList.contains('media-pantalla')}">
172	172	<div
...	...	@@ -22,7 +22,7 @@
22	22	draggable="false"
23	23	ondragstart="return false;"
24	24	(contextmenu)="false"
25		- class="p-2 icon-40"
	25	+ class="p-2 icon-60"
26	26	src="assets/img/icono-volver.svg">
27	27	</div>
28	28	</div>