Luis Suarez / autoservicio-axion

Download as
Browse Code »

Commit ba7edc1701f99785ebaee596298acccfba0a2d90

Authored by Marcelo Puebla
2 parents 314c9dbe12 b9d91aaa0b
Exists in develop

Merge branch 'develop' into 'develop' 

Develop

See merge request !32
Showing 4 changed files   Show diff stats
src/app/modules/cancelar-compra/cancelar-compra.component.html
Diff comments   View file @ ba7edc1
1 1 <div class="row justify-content-center mt-2 h-15">
2   - <img class="w-20 my-auto" src="../../../assets/img/logo-spot.svg">
  2 + <img class="h-100 w-auto my-auto" src="../../../assets/img/logo-spot.svg">
3 3 </div>
4   -<div class="row mt-5 mx-0 justify-content-around h-30">
5   - <div class="col-5 col-md-6 col-lg-3 h-100">
6   - <div class="p-3 bg-white text-center shadow-lg rounded h-100">
7   - <h4 class="pt-3 mt-5">NECESITA</h4>
8   - <h2 class="font-weight-bold text-secondary mt-4">más tiempo</h2>
9   - <h4 class="mt-4">PARA SU PEDIDO?</h4>
  4 +<div class="row mx-auto h-70">
  5 + <div class="col-12 align-self-center">
  6 + <div class="row mt-5 mx-0 justify-content-around">
  7 + <div class="col-12 col-sm-8 col-md-6 col-lg-3">
  8 + <div class="p-3 bg-white text-center shadow-lg rounded">
  9 + <p class="mt-4 h4">NECESITA</p>
  10 + <p class="font-weight-bold text-secondary my-4 h2">más tiempo</p>
  11 + <p class="mb-4 h4">PARA SU PEDIDO?</p>
  12 + </div>
  13 + </div>
10 14 </div>
11   - </div>
12   -</div>
13   -<!-- BUTTONS -->
14   -<div class="row mt-5 h-auto justify-content-center mx-0">
15   - <div class="col-auto px-0 h-auto align-self-start">
16   - <div
17   - class="btn-effect col-auto align-self-center px-0 bg-white"
18   - (click)="volverPreviousPage()">
19   - <div class="row mx-0 bg-primary badge-pill">
20   - <div class="col-auto align-self-center text-white">continuar compra</div>
21   - <div class="col-auto align-self-center p-0">
22   - <img
  15 + <!-- BUTTONS -->
  16 + <div class="row mx-0 mt-5 justify-content-center">
  17 + <div class="col-auto px-0 align-self-start">
  18 + <div
  19 + class="row mx-0 py-1 btn-effect bg-primary badge-pill"
  20 + (click)="volverPreviousPage()">
  21 + <div class="col-auto align-self-center text-white">continuar compra</div>
  22 + <div class="col-auto align-self-center p-0">
  23 + <img
  24 + draggable="false"
  25 + ondragstart="return false;"
  26 + (contextmenu)="false"
  27 + class="p-1 icon-30"
  28 + src="assets/img/ir.svg">
  29 + </div>
  30 + </div>
  31 + </div>
  32 + </div>
  33 + <div class="row mx-0 mt-4 justify-content-center">
  34 + <div class="col-auto px-0 align-self-start">
  35 + <div
  36 + class="row mx-0 py-1 btn-effect bg-grey badge-pill"
  37 + (click)="limpiarCarritoYvolver()">
  38 + <div class="col-auto align-self-center">cancelar compra</div>
  39 + <div class="col-auto align-self-center p-0">
  40 + <img
23 41 draggable="false"
24 42 ondragstart="return false;"
25 43 (contextmenu)="false"
26 44 class="p-1 icon-30"
27   - src="assets/img/ir.svg">
28   - </div>
29   - </div>
30   - </div>
31   - </div>
32   -</div>
33   -<div class="row mt-4 h-auto justify-content-center mx-0">
34   - <div class="col-auto px-0 h-auto align-self-start">
35   - <div
36   - class="btn-effect col-auto align-self-center px-0 bg-white"
37   - (click)="limpiarCarritoYvolver()">
38   - <div class="row mx-0 bg-grey badge-pill">
39   - <div class="col-auto align-self-center">cancelar compra</div>
40   - <div class="col-auto align-self-center p-0">
41   - <img
42   - draggable="false"
43   - ondragstart="return false;"
44   - (contextmenu)="false"
45   - class="p-1 icon-30"
46   - src="assets/img/icono-cancelar-color.svg">
  45 + src="assets/img/icono-cancelar-color.svg">
  46 + </div>
47 47 </div>
48 48 </div>
49 49 </div>
src/app/shared/header-publicidad/header-publicidad.component.html
Diff comments   View file @ ba7edc1
... ... @@ -4,7 +4,7 @@
4 4 <carousel [showIndicators]="false" [interval]="4000">
5 5 <slide *ngFor="let p of publicidades">
6 6 <img
7   - class="d-block h-100 w-auto mx-auto"
  7 + class="h-100 w-100"
8 8 draggable="false"
9 9 ondragstart="return false;"
10 10 (contextmenu)="false"
src/app/shared/promocion/promocion.component.html
Diff comments   View file @ ba7edc1
... ... @@ -28,7 +28,7 @@
28 28 <p class="text-white"><small>¿TE GUSTARÍA LLEVAR ESTE ARTÍCULO</small></p>
29 29 <h1 class="text-white mb-4">en un combo?</h1>
30 30 </div>
31   - <div class="col-3 rounded-circle">
  31 + <div class="col-3">
32 32 <img
33 33 draggable="false"
34 34 ondragstart="return false;"
src/etc/AppSettings.ejemplo.ts
Diff comments   View file @ ba7edc1
1 1 // export const APP_SETTINGS = {
2 2 // apiDeboSuite: 'http://localhost:9900',
3 3 // puntoVenta: 9998,
4   - // numeroPlanilla: '1111',
  4 + // numeroPlanilla: 1111,
5 5 // codigoP: 99996,
6 6 // terminal: 101
7 7 // }