Merge branch 'develop' into 'develop'

Develop See merge request !155

Merge branch 'develop' into 'develop'
Develop See merge request !155
Marcelo Puebla
2 parents 36f686b8f8 c0adc99065
Showing 2 changed files Show diff stats
src/app/modules/seleccion-articulos/seleccion-articulos.component.html
src/app/shared/sinonimo/sinonimo.component.html
@@ -173,7 +173,7 @@
       <div
         class="col-auto mt-2 ml-auto h-20">
         <div class="row mx-0">
-          <div class="col-auto font-weight-bold align-self-center text-primary py-2 h3">TOTAL</div>
+          <p class="col-auto font-weight-bold align-self-center text-primary py-2 h3">TOTAL</p>
           <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.total | currency}}</p>
           </div>
@@ -184,20 +184,20 @@
       <div
         class="col-auto px-0 h-20"
         *ngIf="articuloService.carrito.length"
-        [ngClass]="boxCarrito.classList.contains('media-pantalla') ? 'ml-auto' : 'mt-3'">
+        [ngClass]="boxCarrito.classList.contains('media-pantalla') ? 'ml-auto' : 'mt-2'">
         <div
           class="btn-effect col-auto px-0 align-self-center bg-white"
           [routerLink]="['/carrito']">
           <div class="row mx-0 bg-light">
-            <div class="col-auto p-0 bg-primary">
+            <div class="col-auto px-0 bg-primary">
               <img
                 draggable="false"
                 ondragstart="return false;"
                 (contextmenu)="false"
-                class="p-2 icon-40"
+                class="p-2 icon-60"
                 src="assets/img/carrito.svg">
             </div>
-            <div class="col-auto align-self-center text-primary d-none d-sm-block">IR AL CARRITO</div>
+            <div class="col-auto align-self-center text-primary d-none d-sm-block">PAGAR</div>
           </div>
         </div>
       </div>
@@ -11,7 +11,6 @@
   </div>
  
   <div class="modal-body my-2">
-    <p class="mb-2 h4">Opcion {{currentIndex+1}}</p>
     <p class="mb-2 h5">Cantidad restante {{sinonimos[currentIndex].cantidadRestante}}</p>
     <div class="lista-sinonimos scroll-y-visible">
       <div
...	...	@@ -173,7 +173,7 @@
173	173	<div
174	174	class="col-auto mt-2 ml-auto h-20">
175	175	<div class="row mx-0">
176		- <div class="col-auto font-weight-bold align-self-center text-primary py-2 h3">TOTAL</div>
	176	+ <p class="col-auto font-weight-bold align-self-center text-primary py-2 h3">TOTAL</p>
177	177	<div class="col-auto align-self-center bg-primary badge-pill">
178	178	<p class="text-center font-weight-bold text-white py-2 h3 px-2">{{articuloService.total \| currency}}</p>
179	179	</div>
...	...	@@ -184,20 +184,20 @@
184	184	<div
185	185	class="col-auto px-0 h-20"
186	186	*ngIf="articuloService.carrito.length"
187		- [ngClass]="boxCarrito.classList.contains('media-pantalla') ? 'ml-auto' : 'mt-3'">
	187	+ [ngClass]="boxCarrito.classList.contains('media-pantalla') ? 'ml-auto' : 'mt-2'">
188	188	<div
189	189	class="btn-effect col-auto px-0 align-self-center bg-white"
190	190	[routerLink]="['/carrito']">
191	191	<div class="row mx-0 bg-light">
192		- <div class="col-auto p-0 bg-primary">
	192	+ <div class="col-auto px-0 bg-primary">
193	193	<img
194	194	draggable="false"
195	195	ondragstart="return false;"
196	196	(contextmenu)="false"
197		- class="p-2 icon-40"
	197	+ class="p-2 icon-60"
198	198	src="assets/img/carrito.svg">
199	199	</div>
200		- <div class="col-auto align-self-center text-primary d-none d-sm-block">IR AL CARRITO</div>
	200	+ <div class="col-auto align-self-center text-primary d-none d-sm-block">PAGAR</div>
201	201	</div>
202	202	</div>
203	203	</div>
...	...	@@ -11,7 +11,6 @@
11	11	</div>
12	12
13	13	<div class="modal-body my-2">
14		- <p class="mb-2 h4">Opcion {{currentIndex+1}}</p>
15	14	<p class="mb-2 h5">Cantidad restante {{sinonimos[currentIndex].cantidadRestante}}</p>
16	15	<div class="lista-sinonimos scroll-y-visible">
17	16	<div