Commit a13d413f4d8951e4c9e468142c5c6bd23fde6501
Exists in
develop
Merge branch 'master' into 'develop'
Master(benjamin) See merge request !25
Showing
3 changed files
Show diff stats
src/app/modules/seleccion-articulos/seleccion-articulos.component.html
| ... | ... | @@ -98,7 +98,7 @@ |
| 98 | 98 | </p> |
| 99 | 99 | <div class="col-12 px-1 align-self-end btn-effect h-auto"> |
| 100 | 100 | <div |
| 101 | - [ngClass]="{'bg-secondary': articulo.promo}" | |
| 101 | + [ngClass]="{'bg-secondary': articulo.PRO}" | |
| 102 | 102 | class="row mx-0 justify-content-between bg-primary badge-pill" |
| 103 | 103 | (click)="elegirArticulo(articulo)"> |
| 104 | 104 | <div class="col px-0 align-self-center text-white text-right"> |
src/app/shared/promocion/promocion.component.html
| 1 | -<div class="modal-header bg-primary"> | |
| 1 | +<div class="modal-header bg-primary rounded-top"> | |
| 2 | 2 | <div class="col-12"> |
| 3 | 3 | <div class="row justify-content-between" *ngIf="articulosPromo.length"> |
| 4 | 4 | <div> |
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 | </div> |
| 25 | 25 | </div> |
| 26 | 26 | </div> |
| 27 | -<div class="modal-body bg-primary" *ngIf="articulosPromo.length"> | |
| 27 | +<div class="modal-body bg-primary rounded-bottom" *ngIf="articulosPromo.length"> | |
| 28 | 28 | <div class="row"> |
| 29 | 29 | <div class="col-9"> |
| 30 | 30 | <p class="text-white"><small>¿TE GUSTARÍA LLEVAR ESTE ARTÍCULO</small></p> |
| ... | ... | @@ -32,8 +32,8 @@ |
| 32 | 32 | <div *ngFor="let promo of promociones"> |
| 33 | 33 | <div class="mx-0 mb-2 bg-white badge-pill text-primary" (click)="elegirPromo(promo)"> |
| 34 | 34 | <div class="row mx-0 justify-content-between"> |
| 35 | - <p class="ml-4 text-truncate">{{promo.DetArt}}</p> | |
| 36 | - <p class="mr-4 font-weight-bold">{{promo.PreVen | currency}}</p> | |
| 35 | + <p class="text-truncate"><small>{{promo.DetArt}}</small></p> | |
| 36 | + <p class="font-weight-bold">{{promo.PreVen | currency}}</p> | |
| 37 | 37 | </div> |
| 38 | 38 | </div> |
| 39 | 39 | </div> |