Commit d9e2d82d9d2601bbc93aefae60d58ef97950c074
1 parent
f68a44db2b
Exists in
develop
resuelto merge en info formas de pago
Showing
1 changed file
with
0 additions
and
4 deletions
Show diff stats
src/app/modules/info-formas-pago/info-formas-pago.component.html
1 | <div class="h-92 bg-white fade-in-left"> | 1 | <div class="h-92 bg-white fade-in-left"> |
2 | <div class="row mx-0 h-15"> | 2 | <div class="row mx-0 h-15"> |
3 | <div class="col-12 px-0 h-80 my-auto"> | 3 | <div class="col-12 px-0 h-80 my-auto"> |
4 | <img | 4 | <img |
5 | draggable="false" | 5 | draggable="false" |
6 | ondragstart="return false;" | 6 | ondragstart="return false;" |
7 | (contextmenu)="false" | 7 | (contextmenu)="false" |
8 | class="d-block mx-auto h-100" | 8 | class="d-block mx-auto h-100" |
9 | src="assets/img/logo-spot.svg"> | 9 | src="assets/img/logo-spot.svg"> |
10 | </div> | 10 | </div> |
11 | </div> | 11 | </div> |
12 | <div class="h-85"> | 12 | <div class="h-85"> |
13 | <div class="row h-auto mt-6 mx-0 justify-content-center text-center"> | 13 | <div class="row h-auto mt-6 mx-0 justify-content-center text-center"> |
14 | <<<<<<< HEAD | ||
15 | <div class="col-7 col-lg-4 p-5 m-5 h-auto align-self-end border | 14 | <div class="col-7 col-lg-4 p-5 m-5 h-auto align-self-end border |
16 | border-secondary rounded reduce-card-1"> | 15 | border-secondary rounded reduce-card-1"> |
17 | ======= | ||
18 | <div class="col-7 col-xl-4 p-5 m-5 h-auto align-self-end border border-secondary rounded"> | ||
19 | >>>>>>> 7004c1df495d5ac2e703f7ff659d1d8c3b384953 | ||
20 | <img | 16 | <img |
21 | draggable="false" | 17 | draggable="false" |
22 | ondragstart="return false;" | 18 | ondragstart="return false;" |
23 | (contextmenu)="false" | 19 | (contextmenu)="false" |
24 | class="img-in-top px-4 bg-white" | 20 | class="img-in-top px-4 bg-white" |
25 | src="assets/img/icono-tarjetas.svg"> | 21 | src="assets/img/icono-tarjetas.svg"> |
26 | <p class="h6 m-0">ESTA TERMINAL OPERA CON</p> | 22 | <p class="h6 m-0">ESTA TERMINAL OPERA CON</p> |
27 | <p class="h2 mb-3 text-secondary"> | 23 | <p class="h2 mb-3 text-secondary"> |
28 | tarjetas y | 24 | tarjetas y |
29 | <img | 25 | <img |
30 | draggable="false" | 26 | draggable="false" |
31 | ondragstart="return false;" | 27 | ondragstart="return false;" |
32 | (contextmenu)="false" | 28 | (contextmenu)="false" |
33 | class="icon-150" | 29 | class="icon-150" |
34 | src="assets/img/icono-mercado-pago.svg"> | 30 | src="assets/img/icono-mercado-pago.svg"> |
35 | </p> | 31 | </p> |
36 | <div | 32 | <div |
37 | class="d-inline-block py-1 btn-effect bg-secondary badge-pill text-white" | 33 | class="d-inline-block py-1 btn-effect bg-secondary badge-pill text-white" |
38 | [routerLink]="['/opcion-pedido']"> | 34 | [routerLink]="['/opcion-pedido']"> |
39 | CONTINUAR | 35 | CONTINUAR |
40 | <img | 36 | <img |
41 | draggable="false" | 37 | draggable="false" |
42 | ondragstart="return false;" | 38 | ondragstart="return false;" |
43 | (contextmenu)="false" | 39 | (contextmenu)="false" |
44 | class="icon-30" | 40 | class="icon-30" |
45 | src="assets/img/ir.svg"> | 41 | src="assets/img/ir.svg"> |
46 | </div> | 42 | </div> |
47 | </div> | 43 | </div> |
48 | <div class="col-7 col-lg-4 p-5 m-5 h-auto align-self-center border | 44 | <div class="col-7 col-lg-4 p-5 m-5 h-auto align-self-center border |
49 | border-primary rounded reduce-card-2"> | 45 | border-primary rounded reduce-card-2"> |
50 | <img | 46 | <img |
51 | draggable="false" | 47 | draggable="false" |
52 | ondragstart="return false;" | 48 | ondragstart="return false;" |
53 | (contextmenu)="false" | 49 | (contextmenu)="false" |
54 | class="img-in-top px-4 bg-white" | 50 | class="img-in-top px-4 bg-white" |
55 | src="assets/img/icono-efectivo.svg"> | 51 | src="assets/img/icono-efectivo.svg"> |
56 | <p class="h6 m-0">SI PREFERIS PAGAR EN EFECTIVO</p> | 52 | <p class="h6 m-0">SI PREFERIS PAGAR EN EFECTIVO</p> |
57 | <p class="h2 m-0 text-primary">te esperamos en la caja</p> | 53 | <p class="h2 m-0 text-primary">te esperamos en la caja</p> |
58 | </div> | 54 | </div> |
59 | </div> | 55 | </div> |
60 | </div> | 56 | </div> |
61 | </div> | 57 | </div> |
62 | 58 |