Marcelo Puebla / autoservicio-axion

Commit 93d40bc42ebea192b22f49f1a5923cdbe7069b39

Authored by Marcelo Puebla 2020-01-29 16:46:50 -0300

Exists in develop

Merge branch 'master' into 'develop'

Master(benjamin)

See merge request !81

Showing 2 changed files Show diff stats

src/app/shared/promocion/promocion.component.html

Diff comments View file @ 93d40bc

 <!-- <div class="d-flex justify-content-center"
      *ngIf="loading">
   <div class="spinner-border text-primary" role="status">
     <span class="sr-only">Loading...</span>
   </div>
 </div> -->
-<div class="modal-header bg-primary rounded-top pt-4 px-2">
+<div class="modal-header bg-primary rounded-top pt-4 px-2" *ngIf="articulosPromo.length">
-  <div class="row mx-0 w-100 justify-content-between" *ngIf="articulosPromo.length">
+  <img
+  draggable="false"
+  ondragstart="return false;"
+  (contextmenu)="false"
+  (click)="selectPromo(articulosPromo[0])"
+  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 mt-3">
     <div class="col-8">
-      <p class="h3 text-white">{{articulosPromo[0].DetArt}}</p>
+      <p class="h3 mt-n2 text-white">{{articulosPromo[0].DetArt}}</p>
     </div>
     <div class="col-4 align-self-center">
       <div
         class="row mx-0 justify-content-between bg-white badge-pill"
         (click)="selectPromo(articulosPromo[0])">
         <div class="col px-0 align-self-center text-primary">
           <p class="font-weight-bold">{{articulosPromo[0].PreVen | currency}}</p>
         </div>
         <div class="col-3 px-0">
           <img
             draggable="false"
             ondragstart="return false;"
             (contextmenu)="false"
             class="d-block ml-auto py-1 icon-30 mr-2 pt-2"
             src="assets/img/ir-color.svg">
         </div>
       </div>
     </div>
   </div>
 </div>
 <div class="modal-body bg-primary rounded-bottom pb-3 px-2" *ngIf="articulosPromo.length">
   <div class="row mx-0 w-100">
     <div class="col-9">
       <p class="text-white"><small>¿TE GUSTARÍA LLEVAR ESTE ARTÍCULO</small></p>
       <h1 class="text-white mb-4">en un combo?</h1>
     </div>
     <div class="col-3">
       <img
         draggable="false"
         ondragstart="return false;"
         (contextmenu)="false"
         src="{{urlImagenes}}{{articulosPromo[0].imagenes[0].imagen}}"
         onerror="this.src='assets/img/imagen-no-encontrada.jpg'"
         class="card-img-top img-fluid rounded-circle">
     </div>
   </div>
   <div
     class="row mx-0 lista-promociones scroll-y-visible"
     (scroll)="scrollEvent($event)">
     <div class="col-12">
       <div *ngFor="let promo of promociones">
         <div
           class="mx-0 mb-2 btn-effect bg-white badge-pill text-primary"
           (click)="selectPromo(promo)">
           <div class="d-flex">
             <p class="text-truncate mr-auto my-auto"><small>{{promo.DetArt}}</small></p>
             <p class="font-weight-bold my-auto pr-2">
               <span>{{promo.PreVen | currency}}</span>
             </p>
             <img
               draggable="false"
               ondragstart="return false;"
               (contextmenu)="false"
               class="d-block ml-auto py-1 icon-30 mr-2 pt-2"
               src="assets/img/ir-color.svg">
           </div>
         </div>
       </div>
     </div>
   </div>
 </div>

src/assets/img/icono-cancelar-blanco.svg

Diff comments View file @ 93d40bc

File was created	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
	3	<!-- Creator: CorelDRAW X7 -->
	4	<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="19.8306mm" height="19.8306mm" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
	5	viewBox="0 0 1652 1652"
	6	xmlns:xlink="http://www.w3.org/1999/xlink">
	7	<defs>
	8	<style type="text/css">
	9	<![CDATA[
	10	.fil0 {fill:#FEFEFE;fill-rule:nonzero}
	11	]]>
	12	</style>
	13	</defs>
	14	<g id="Capa_x0020_1">
	15	<metadata id="CorelCorpID_0Corel-Layer"/>
	16	<polygon class="fil0" points="494,409 826,766 1158,409 1214,457 882,826 1214,1196 1158,1244 826,886 494,1244 439,1196 770,826 439,457 "/>
	17	<path class="fil0" d="M1360 292c-136,-137 -325,-221 -534,-221 -208,0 -397,84 -534,221 -137,137 -221,326 -221,534 0,209 84,398 221,534 137,137 326,222 534,222 209,0 398,-85 534,-222 137,-136 222,-325 222,-534 0,-208 -85,-397 -222,-534zm-534 -292c228,0 435,92 584,242 150,149 242,356 242,584 0,228 -92,435 -242,584 -149,150 -356,242 -584,242 -228,0 -435,-92 -584,-242 -150,-149 -242,-356 -242,-584 0,-228 92,-435 242,-584 149,-150 356,-242 584,-242z"/>
	18	</g>
	19	</svg>
	20