Commit 8e18714e1c5212140c53b7f3aa9456c9a7e4a9bb

Authored by Nicolás Guarnieri
Exists in master

Merge branch 'master' into 'master'

Master(efernandez)

See merge request !13
img/hojaRutaVolante.png

9.99 KB

img/seguimientoCobranza.png

12.1 KB

... ... @@ -71,6 +71,7 @@
71 71 <script src="./node_modules/foca-abm-vehiculo/dist/foca-abm-vehiculo.min.js"></script>
72 72 <script src="./node_modules/foca-modal-efectivo/dist/foca-modal-efectivo.min.js"></script>
73 73 <script src="./node_modules/foca-modal-cobrador/dist/foca-modal-cobradores.min.js"></script>
  74 + <script src="./node_modules/foca-modal-cobranza/dist/foca-modal-cobranza.min.js"></script>
74 75  
75 76 <script src="./src/js/app.js"></script>
76 77 <script src="./src/js/controller.js"></script>
... ... @@ -51,6 +51,7 @@
51 51 "foca-modal-cheque": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cheque.git",
52 52 "foca-modal-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-chofer.git",
53 53 "foca-modal-cobrador": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cobrador.git",
  54 + "foca-modal-cobranza": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cobranza.git",
54 55 "foca-modal-cotizacion": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cotizacion.git",
55 56 "foca-modal-detalle-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-detalle-hoja-ruta.git",
56 57 "foca-modal-domicilio": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-domicilio.git",
... ... @@ -33,6 +33,7 @@ angular.module(&#39;appWrapperDemo&#39;, [
33 33 'focaModalCheque',
34 34 'focaModalChofer',
35 35 'focaModalCobradores',
  36 + 'focaModalCobranza',
36 37 'focaModalCotizacion',
37 38 'focaModalDetalleHojaRuta',
38 39 'focaModalDomicilio',
src/sass/_botonera-principal.scss
... ... @@ -110,6 +110,12 @@
110 110 }
111 111 }
112 112 }
  113 + &-seguimiento-hoja-ruta {
  114 + & button {
  115 + background-image: url('../img/hojaRutaVolante.png');
  116 + background-size: 90px 90px;
  117 + }
  118 + }
113 119 &-cobranzas {
114 120 & button {
115 121 background-position: -1880 0px;
... ... @@ -118,6 +124,28 @@
118 124 }
119 125 }
120 126 }
  127 + &-seguimiento-cobranzas {
  128 + & button {
  129 + background-image: url('../img/seguimientoCobranza.png');
  130 + background-size: 90px 90px;
  131 + }
  132 + }
  133 + &-vehiculo {
  134 + & button {
  135 + background-position: -4560px 0px;
  136 + &:hover {
  137 + background-position: -4560px -90px;
  138 + }
  139 + }
  140 + }
  141 + &-precio-condicion {
  142 + & button {
  143 + background-position: -4560px 0px;
  144 + &:hover {
  145 + background-position: -4560px -90px;
  146 + }
  147 + }
  148 + }
121 149 .swiper-pagination {
122 150 bottom: 0px !important;
123 151 }