Commit 34d23dd6e0ca83a773ce700baf90c2612a560901
Exists in
develop
Merge branch 'develop' of git.focasoftware.com:angular/autoservicio-axion
Showing
3 changed files
Show diff stats
src/app/app.component.ts
| ... | ... | @@ -21,15 +21,14 @@ export class AppComponent { |
| 21 | 21 | this.connectionService.monitor().subscribe(isConnected => { |
| 22 | 22 | this.isConnected = isConnected; |
| 23 | 23 | if (this.isConnected && this.modalRef) { |
| 24 | - this.modalRef.hide() | |
| 25 | - } | |
| 26 | - else { | |
| 24 | + this.modalRef.hide(); | |
| 25 | + } else { | |
| 27 | 26 | this.modalRef = this.modalService.show(InternetConnectionComponent, { |
| 28 | 27 | backdrop: false, |
| 29 | 28 | ignoreBackdropClick: true, |
| 30 | 29 | class: 'modal-dialog-centered' |
| 31 | 30 | }); |
| 32 | 31 | } |
| 33 | - }) | |
| 32 | + }); | |
| 34 | 33 | } |
| 35 | 34 | } |
src/app/shared/promocion/promocion.component.html
| ... | ... | @@ -4,10 +4,17 @@ |
| 4 | 4 | <span class="sr-only">Loading...</span> |
| 5 | 5 | </div> |
| 6 | 6 | </div> --> |
| 7 | -<div class="modal-header bg-primary rounded-top pt-4 px-2"> | |
| 8 | - <div class="row mx-0 w-100 justify-content-between" *ngIf="articulosPromo.length"> | |
| 7 | +<div class="modal-header bg-primary rounded-top pt-4 px-2" *ngIf="articulosPromo.length"> | |
| 8 | + <img | |
| 9 | + draggable="false" | |
| 10 | + ondragstart="return false;" | |
| 11 | + (contextmenu)="false" | |
| 12 | + (click)="selectPromo(articulosPromo[0])" | |
| 13 | + class="btn-effect mt-n3 icon-30 mr-2 position-absolute right-0" | |
| 14 | + src="assets/img/icono-cancelar-blanco.svg"> | |
| 15 | + <div class="row mx-0 w-100 justify-content-between mt-3"> | |
| 9 | 16 | <div class="col-8"> |
| 10 | - <p class="h3 text-white">{{articulosPromo[0].DetArt}}</p> | |
| 17 | + <p class="h3 mt-n2 text-white">{{articulosPromo[0].DetArt}}</p> | |
| 11 | 18 | </div> |
| 12 | 19 | <div class="col-4 align-self-center"> |
| 13 | 20 | <div |
src/assets/img/icono-cancelar-blanco.svg
| ... | ... | @@ -0,0 +1,19 @@ |
| 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> |