Martin Macola / autoservicio

Download as
Browse Code »

Commit c9ff4e581f7b7a776162336d9a48ada7c70cf6b3

Authored by Marcelo Puebla
2 parents 5b3ad9caac baf9a0338d
Exists in master

Merge branch 'master' of git.focasoftware.com:angular/autoservicio

Showing 7 changed files   Show diff stats
src/app/components/inicio/inicio.component.html
Diff comments   View file @ c9ff4e5
... ... @@ -42,7 +42,14 @@
42 42 <!-- PROMOCIONES -->
43 43 <div class="card card-effect bg-white border-0 shadow rounded w-100 mb-auto">
44 44 <div class="card-body text-left p-4">
45   - <p class="h3 card-title">Promociones</p>
  45 + <div class="row">
  46 + <div class="col-7">
  47 + <p class="h3 card-title">Promociones</p>
  48 + </div>
  49 + <div class="col-5 p-0">
  50 + <img src="../../../assets/icons/primario.promociones.png" alt="" class="icon-dim m-0">
  51 + </div>
  52 + </div>
46 53 <p class="h5 card-text text-muted font-weight-light">Conozca las ofertas del momento.</p>
47 54 </div>
48 55 <div id="carouselIndicators" class="carousel slide mb-4" data-ride="carousel">
... ... @@ -68,7 +75,16 @@
68 75 <!-- ORDENAR -->
69 76 <div class="card card-effect bg-white border-0 shadow rounded w-100 mt-4">
70 77 <div class="card-body text-left p-4">
71   - <p class="h3 card-title">Ordenar</p>
  78 + <div class="row">
  79 + <div class="col-5">
  80 + <p class="h3 card-title">Ordenar</p>
  81 + </div>
  82 + <div class="col-7 p-0">
  83 + <div class="bg-white"><img src="../../../assets/icons/primario.ordenar.png" alt="" class="icon-dim">
  84 + </div>
  85 + </div>
  86 + </div>
  87 +
72 88 <p class="h5 card-text text-muted font-weight-light">Arme su pedido y solo pase a retirar.</p>
73 89 </div>
74 90 <img class="card-img-bottom d-block w-50 mx-auto mb-4 rounded" src="../../assets/img/descarga.jpg">
... ... @@ -81,7 +97,14 @@
81 97 <!-- CARGAR PRODUCTOS -->
82 98 <div class="card card-effect bg-white border-0 shadow rounded w-100 mb-auto">
83 99 <div class="card-body text-left p-4">
84   - <p class="h3 card-title">Cargar Productos</p>
  100 + <div class="row">
  101 + <div class="col-6">
  102 + <p class="h3 card-title">Cargar Productos</p>
  103 + </div>
  104 + <div class="col-6 p-0">
  105 + <img src="../../../assets//icons/escanear.png" alt="" class="icon-dim mb-2">
  106 + </div>
  107 + </div>
85 108 <p class="h5 card-text text-muted font-weight-light">
86 109 Coloque el código de<br>
87 110 barras o QR frente al scanner.
... ... @@ -100,11 +123,18 @@
100 123 <div (click)="goPage('busqueda-productos')"
101 124 class="card card-effect bg-white border-0 shadow rounded w-100 mt-4">
102 125 <div class="card-body text-left p-4">
103   - <p class="h3 card-title">Buscar Productos</p>
104   - <p class="h5 card-text text-muted font-weight-light">
105   - Busque aquí los productos<br>
106   - que no tienen código
107   - </p>
  126 + <div class="row">
  127 + <div class="col-6">
  128 + <p class="h3 card-title">Buscar Productos</p>
  129 + <p class="h5 card-text text-muted font-weight-light">
  130 + Busque aquí los productos<br>
  131 + que no tienen código </p>
  132 + </div>
  133 + <div class="col-6 p-0">
  134 + <img src="../../../assets/icons/primario.buscar.png" alt="" class="icon-dim mb-2">
  135 + </div>
  136 + </div>
  137 +
108 138 </div>
109 139 </div>
110 140  
src/app/components/inicio/inicio.component.scss
Diff comments   View file @ c9ff4e5
... ... @@ -26,3 +26,5 @@
26 26 .black-text {
27 27 color: black;
28 28 }
  29 +
  30 +
src/assets/icons/escanear.png
Diff comments   View file @ c9ff4e5

8.51 KB
src/assets/icons/primario.buscar.png
Diff comments   View file @ c9ff4e5

8.82 KB
src/assets/icons/primario.ordenar.png
Diff comments   View file @ c9ff4e5

6.55 KB
src/assets/icons/primario.promociones.png
Diff comments   View file @ c9ff4e5

9.35 KB
src/assets/scss/bootstrap-override.scss
Diff comments   View file @ c9ff4e5
... ... @@ -16,4 +16,10 @@ $theme-colors: (
16 16 border-color: #2872ae !important;
17 17 }
18 18  
  19 +.icon-dim{
  20 + height: 40px !important;
  21 + width: auto !important;
  22 + background-color: white !important;
  23 +}
  24 +
19 25 @import "../../../node_modules/bootstrap/scss/bootstrap.scss";