Commit d4523eb00c9d19925da7ffc381c78f87307601c4

Authored by Eric Fernandez
Exists in master

Merge branch 'master' into 'develop'

Cambio de iconos de botonera principal

See merge request !102

6.16 KB | W: | H:

7.03 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.73 KB | W: | H:

8.33 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
img/abmVehiculos.png

3.74 KB | W: | H:

6.88 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
img/abmVendedorCobrador.png

5.6 KB | W: | H:

3.47 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
img/agendarVisita.png

4.07 KB | W: | H:

7.3 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

6.07 KB | W: | H:

7.03 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

8.43 KB

img/control_stock.png

7.77 KB

6.62 KB

7.27 KB

4.53 KB | W: | H:

8.63 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.68 KB

3.26 KB | W: | H:

5.37 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
img/seguimientoCobranza.png

12.1 KB | W: | H:

23.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
img/seguimientoHojaRuta.png

11.8 KB | W: | H:

8.57 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
img/seguimientoNotaPedido.png

12 KB | W: | H:

19.5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -97,7 +97,7 @@
97 97 "gulp-htmlmin": "^5.0.1",
98 98 "gulp-sequence": "^1.0.0",
99 99 "gulp-uglify-es": "^1.0.4",
100   - "jquery": "^3.3.1",
  100 + "jquery": "^3.4.0",
101 101 "jszip": "2.6.1",
102 102 "ladda": "1.0.6",
103 103 "leaflet": "1.3.4",
... ... @@ -120,7 +120,7 @@
120 120 "gulp-sass": "^4.0.1",
121 121 "gulp-uglify": "^3.0.2",
122 122 "gulp-watch": "^5.0.1",
123   - "jasmine-core": "^3.3.0",
  123 + "jasmine-core": "^3.4.0",
124 124 "jshint": "^2.10.2",
125 125 "pre-commit": "^1.2.2",
126 126 "pump": "^3.0.0"
src/sass/_botonera-principal.scss
... ... @@ -76,6 +76,24 @@
76 76 }
77 77 }
78 78 }
  79 + &-estado-cisterna {
  80 + & button {
  81 + background-image: url('../img/control_stock.png');
  82 + background-size: 90px 90px;
  83 + &:hover {
  84 + background-color: rgb(250,250,250);
  85 + }
  86 + }
  87 + }
  88 + &-logistica {
  89 + & button {
  90 + background-image: url('../img/logistica.png');
  91 + background-size: 90px 90px;
  92 + &:hover {
  93 + background-color: rgb(250,250,250);
  94 + }
  95 + }
  96 + }
79 97 &-facturador {
80 98 & button {
81 99 background-position: -270px 0px;
... ... @@ -86,25 +104,28 @@
86 104 }
87 105 &-nota-pedido {
88 106 & button {
89   - background-position: -1250px 0px;
  107 + background-image: url('../img/notaPedido.png');
  108 + background-size: 90px 90px;
90 109 &:hover {
91   - background-position: -1250px -90px;
  110 + background-color: rgb(250,250,250);
92 111 }
93 112 }
94 113 }
95 114 &-remito {
96 115 & button {
97   - background-position: -4560px 0px;
  116 + background-image: url('../img/remito.png');
  117 + background-size: 90px 90px;
98 118 &:hover {
99   - background-position: -4560px -90px;
  119 + background-color: rgb(250,250,250);
100 120 }
101 121 }
102 122 }
103 123 &-hoja-ruta {
104 124 & button {
105   - background-position: -4650px 0px;
  125 + background-image: url('../img/hoja-ruta.png');
  126 + background-size: 86px 90px;
106 127 &:hover {
107   - background-position: -4650px -90px;
  128 + background-color: rgb(250,250,250);
108 129 }
109 130 }
110 131 }
... ... @@ -121,7 +142,7 @@
121 142 & button {
122 143 background-image: url('../img/seguimientoNotaPedido.png');
123 144 background-size: 90px 90px;
124   - background-position: 15px 10px;
  145 + // background-position: 15px 10px;
125 146 &:hover {
126 147 background-color: rgb(250,250,250);
127 148 }
... ... @@ -131,7 +152,7 @@
131 152 & button {
132 153 background-image: url('../img/seguimientoHojaRuta.png');
133 154 background-size: 90px 90px;
134   - background-position: 15px 10px;
  155 + // background-position: 15px 10px;
135 156 &:hover {
136 157 background-color: rgb(250,250,250);
137 158 }
... ... @@ -139,9 +160,11 @@
139 160 }
140 161 &-cobranzas {
141 162 & button {
142   - background-position: -1880 0px;
  163 + background-image: url('../img/cobranzas.png');
  164 + background-size: 90px 90px;
  165 + // background-position: 15px 10px;
143 166 &:hover {
144   - background-position: -1880 -90px;
  167 + background-color: rgb(250,250,250);
145 168 }
146 169 }
147 170 }
... ... @@ -149,7 +172,7 @@
149 172 & button {
150 173 background-image: url('../img/seguimientoCobranza.png');
151 174 background-size: 90px 90px;
152   - background-position: 15px 10px;
  175 + // background-position: 15px 10px;
153 176 &:hover {
154 177 background-color: rgb(250,250,250);
155 178 }
... ... @@ -187,6 +210,7 @@
187 210 background-image: url('../img/agendarVisita.png');
188 211 background-size: 90px 90px;
189 212 &:hover {
  213 + box-shadow: 2px;
190 214 background-color: rgb(250,250,250);
191 215 }
192 216 }