Merge branch 'develop' of git.focasoftware.com:angular/autoservicio-axion into develop

Marcelo Puebla
2 parents e60162d1d4 2f9b39cad9
Showing 2 changed files Show diff stats
src/app/shared/confirmacion/confirmacion.component.html
src/app/shared/header-publicidad/header-publicidad.component.ts
 <div class="modal-header bg-primary rounded-top pt-4 px-2">
+  <img
+  draggable="false"
+  ondragstart="return false;"
+  (contextmenu)="false"
+  (click)="close()"
+  class="btn-effect mt-n3 icon-30 mr-2 position-absolute right-0"
+  src="assets/img/icono-cancelar-blanco.svg">
   <div class="row mx-0 w-100 justify-content-between">
     <div class="col-8">
       <p *ngIf="titleMessage" class="h3 text-white">{{titleMessage}}</p>
@@ -74,7 +74,7 @@ export class HeaderPublicidadComponent implements OnInit {
         initialState: {
           titleMessage: articulo.DET_LAR,
           imagenPath: articulo.imagenes.length ? articulo.imagenes[0].imagen : 'assets/img/imagen-no-encontrada.jpg',
-          footerMessageFirst: `¿DESEA AGREGAR ESTE ARTÍCULO`,
+          footerMessageFirst: `¿DESEA AGREGAR ESTE COMBO`,
           footerMessageSecond: `a su carrito?`,
           footerConfirmation: articulo.PreVen,
           footerClose: `volver`
1	1	<div class="modal-header bg-primary rounded-top pt-4 px-2">
	2	+ <img
	3	+ draggable="false"
	4	+ ondragstart="return false;"
	5	+ (contextmenu)="false"
	6	+ (click)="close()"
	7	+ class="btn-effect mt-n3 icon-30 mr-2 position-absolute right-0"
	8	+ src="assets/img/icono-cancelar-blanco.svg">
2	9	<div class="row mx-0 w-100 justify-content-between">
3	10	<div class="col-8">
4	11	<p *ngIf="titleMessage" class="h3 text-white">{{titleMessage}}</p>
...	...	@@ -74,7 +74,7 @@ export class HeaderPublicidadComponent implements OnInit {
74	74	initialState: {
75	75	titleMessage: articulo.DET_LAR,
76	76	imagenPath: articulo.imagenes.length ? articulo.imagenes[0].imagen : 'assets/img/imagen-no-encontrada.jpg',
77		- footerMessageFirst: `¿DESEA AGREGAR ESTE ARTÍCULO`,
	77	+ footerMessageFirst: `¿DESEA AGREGAR ESTE COMBO`,
78	78	footerMessageSecond: `a su carrito?`,
79	79	footerConfirmation: articulo.PreVen,
80	80	footerClose: `volver`