Commit 02c76efa3255917b51707941b63d5b65f0ffa24b

Authored by Eric Fernandez
Exists in master

Merge branch 'master' into 'develop'

Master

See merge request !117
img/FechaEntrega.png

4.63 KB

img/clientePrincipal.png

5.5 KB

img/fechaDeReparto.png

4.19 KB

img/parametrizar.png

10.1 KB | W: | H:

10.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
src/sass/_botonera-principal.scss
1 .botonera-principal { 1 .botonera-principal {
2 menuitem { 2 menuitem {
3 display: inline-block; 3 display: inline-block;
4 height: 130px; 4 height: 130px;
5 text-align: center; 5 text-align: center;
6 width: 180px; 6 width: 180px;
7 @media (max-width: 576px) { 7 @media (max-width: 576px) {
8 width: 100%; 8 width: 100%;
9 } 9 }
10 @media (min-width: 992px) and (max-width: 1200px){ 10 @media (min-width: 992px) and (max-width: 1200px){
11 width: 150px; 11 width: 150px;
12 } 12 }
13 } 13 }
14 button { 14 button {
15 background-image: url('../img/botonera.png'); 15 background-image: url('../img/botonera.png');
16 border-radius: 12px; 16 border-radius: 12px;
17 border-width: 0; 17 border-width: 0;
18 height: 90px; 18 height: 90px;
19 position: relative; 19 position: relative;
20 width: 90px; 20 width: 90px;
21 outline: 0; 21 outline: 0;
22 span { 22 span {
23 left: 0; 23 left: 0;
24 position: absolute; 24 position: absolute;
25 text-align: center; 25 text-align: center;
26 top: 90px; 26 top: 90px;
27 width: 100%; 27 width: 100%;
28 font-size: 12px; 28 font-size: 12px;
29 color: #777777; 29 color: #777777;
30 } 30 }
31 &:hover { 31 &:hover {
32 background-color:rgb(250,250,250); 32 background-color:rgb(250,250,250);
33 filter:drop-shadow(4px 4px 4px gray); 33 filter:drop-shadow(4px 4px 4px gray);
34 } 34 }
35 &:active { 35 &:active {
36 background-color: rgb(230, 230, 230); 36 background-color: rgb(230, 230, 230);
37 filter:drop-shadow(4px 4px 4px gray); 37 filter:drop-shadow(4px 4px 4px gray);
38 } 38 }
39 } 39 }
40 &-menu { 40 &-menu {
41 width: 100%; 41 width: 100%;
42 padding-left: 90px; 42 padding-left: 90px;
43 @media (max-width: 576px) { 43 @media (max-width: 576px) {
44 padding: 0; 44 padding: 0;
45 } 45 }
46 } 46 }
47 &-logo { 47 &-logo {
48 width: 100%; 48 width: 100%;
49 margin-left: 50%; 49 margin-left: 50%;
50 opacity: .8; 50 opacity: .8;
51 @media (max-width: 576px) { 51 @media (max-width: 576px) {
52 width: 180%; 52 width: 180%;
53 margin-left: 20%; 53 margin-left: 20%;
54 } 54 }
55 } 55 }
56 &-vacio { 56 &-vacio {
57 & button { 57 & button {
58 background-position: -4380px 0; 58 background-position: -4380px 0;
59 &:hover { 59 &:hover {
60 background-position: -4380px -90px; 60 background-position: -4380px -90px;
61 } 61 }
62 } 62 }
63 } 63 }
64 &-abrir-turno { 64 &-abrir-turno {
65 & button { 65 & button {
66 background-position: 0 0; 66 background-position: 0 0;
67 &:hover { 67 &:hover {
68 background-position: 0 -90px; 68 background-position: 0 -90px;
69 } 69 }
70 } 70 }
71 } 71 }
72 &-cerrar-turno { 72 &-cerrar-turno {
73 & button { 73 & button {
74 background-position: -90px 0; 74 background-position: -90px 0;
75 &:hover { 75 &:hover {
76 background-position: -90px -90px; 76 background-position: -90px -90px;
77 } 77 }
78 } 78 }
79 } 79 }
80 &-caja { 80 &-caja {
81 & button { 81 & button {
82 background-position: -180px 0; 82 background-position: -180px 0;
83 &:hover { 83 &:hover {
84 background-position: -180px -90px; 84 background-position: -180px -90px;
85 } 85 }
86 } 86 }
87 } 87 }
88 &-estado-cisterna { 88 &-estado-cisterna {
89 & button { 89 & button {
90 background-image: url('../img/control_stock.png'); 90 background-image: url('../img/control_stock.png');
91 background-size: 90px 90px; 91 background-size: 90px 90px;
92 } 92 }
93 } 93 }
94 &-logistica { 94 &-logistica {
95 & button { 95 & button {
96 background-image: url('../img/logistica.png'); 96 background-image: url('../img/logistica.png');
97 background-size: 90px 90px; 97 background-size: 90px 90px;
98 } 98 }
99 } 99 }
100 &-facturador { 100 &-facturador {
101 & button { 101 & button {
102 background-position: -270px 0px; 102 background-position: -270px 0px;
103 &:hover { 103 &:hover {
104 background-position: -270px -90px; 104 background-position: -270px -90px;
105 } 105 }
106 } 106 }
107 } 107 }
108 &-nota-pedido { 108 &-nota-pedido {
109 & button { 109 & button {
110 background-image: url('../img/notaPedido.png'); 110 background-image: url('../img/notaPedido.png');
111 background-size: 90px 90px; 111 background-size: 90px 90px;
112 } 112 }
113 } 113 }
114 &-remito { 114 &-remito {
115 & button { 115 & button {
116 background-image: url('../img/remito.png'); 116 background-image: url('../img/remito.png');
117 background-size: 90px 90px; 117 background-size: 90px 90px;
118 } 118 }
119 } 119 }
120 &-hoja-ruta { 120 &-hoja-ruta {
121 & button { 121 & button {
122 background-image: url('../img/hoja-ruta.png'); 122 background-image: url('../img/hoja-ruta.png');
123 background-size: 86px 90px; 123 background-size: 86px 90px;
124 } 124 }
125 } 125 }
126 &-activar-hoja-ruta { 126 &-activar-hoja-ruta {
127 & button { 127 & button {
128 background-image: url('../img/activar_hoja.png'); 128 background-image: url('../img/activar_hoja.png');
129 background-size: 90px 90px; 129 background-size: 90px 90px;
130 } 130 }
131 } 131 }
132 &-hoja-ruta-transportista { 132 &-hoja-ruta-transportista {
133 & button { 133 & button {
134 background-image: url('../img/hojaRutaVolante.png'); 134 background-image: url('../img/hojaRutaVolante.png');
135 background-size: 90px 90px; 135 background-size: 90px 90px;
136 } 136 }
137 } 137 }
138 &-seguimiento { 138 &-seguimiento {
139 & button { 139 & button {
140 background-image: url('../img/seguimientoNotaPedido.png'); 140 background-image: url('../img/seguimientoNotaPedido.png');
141 background-size: 90px 90px; 141 background-size: 90px 90px;
142 } 142 }
143 } 143 }
144 &-seguimiento-hoja-ruta { 144 &-seguimiento-hoja-ruta {
145 & button { 145 & button {
146 background-image: url('../img/seguimientoHojaRuta.png'); 146 background-image: url('../img/seguimientoHojaRuta.png');
147 background-size: 90px 90px; 147 background-size: 90px 90px;
148 } 148 }
149 } 149 }
150 &-cobranzas { 150 &-cobranzas {
151 & button { 151 & button {
152 background-image: url('../img/cobranzas.png'); 152 background-image: url('../img/cobranzas.png');
153 background-size: 90px 90px; 153 background-size: 90px 90px;
154 } 154 }
155 } 155 }
156 &-seguimiento-cobranzas { 156 &-seguimiento-cobranzas {
157 & button { 157 & button {
158 background-image: url('../img/seguimientoCobranza.png'); 158 background-image: url('../img/seguimientoCobranza.png');
159 background-size: 90px 90px; 159 background-size: 90px 90px;
160 } 160 }
161 } 161 }
162 &-vehiculo { 162 &-vehiculo {
163 & button { 163 & button {
164 background-image: url('../img/abmVehiculos.png'); 164 background-image: url('../img/abmVehiculos.png');
165 background-size: 90px 90px; 165 background-size: 90px 90px;
166 } 166 }
167 } 167 }
168 &-precio-condicion { 168 &-precio-condicion {
169 & button { 169 & button {
170 background-image: url('../img/abmPrecios.png'); 170 background-image: url('../img/abmPrecios.png');
171 background-size: 90px 90px; 171 background-size: 90px 90px;
172 } 172 }
173 } 173 }
174 &-chofer { 174 &-chofer {
175 & button { 175 & button {
176 background-image: url('../img/abmChofer.png'); 176 background-image: url('../img/abmChofer.png');
177 background-size: 90px 90px; 177 background-size: 90px 90px;
178 } 178 }
179 } 179 }
180 &-agendar-visita { 180 &-agendar-visita {
181 & button { 181 & button {
182 background-image: url('../img/agendarVisita.png'); 182 background-image: url('../img/agendarVisita.png');
183 background-size: 90px 90px; 183 background-size: 90px 90px;
184 } 184 }
185 } 185 }
186 &-informes { 186 &-informes {
187 & button { 187 & button {
188 background-image: url('../img/informes.png'); 188 background-image: url('../img/informes.png');
189 background-size: 90px 90px; 189 background-size: 90px 90px;
190 } 190 }
191 } 191 }
192 &-vendedor-cobrador { 192 &-vendedor-cobrador {
193 & button { 193 & button {
194 background-image: url('../img/abmVendedorCobrador.png'); 194 background-image: url('../img/abmVendedorCobrador.png');
195 background-size: 90px 90px; 195 background-size: 90px 90px;
196 } 196 }
197 } 197 }
198 &-autorizar-nota { 198 &-autorizar-nota {
199 & button { 199 & button {
200 background-image: url('../img/autorizarNota.png'); 200 background-image: url('../img/autorizarNota.png');
201 background-size: 90px 90px; 201 background-size: 90px 90px;
202 } 202 }
203 } 203 }
204
205 &-cliente {
206 & button {
207 background-image: url('../img/clientePrincipal.png');
208 background-size: 90px 90px;
209 }
210 }
211
204 &-parametros { 212 &-parametros {
205 & button { 213 & button {
206 background-image: url('../img/parametrizar.png'); 214 background-image: url('../img/parametrizar.png');
207 background-size: 90px 90px; 215 background-size: 90px 90px;
208 } 216 }
209 } 217 }
210 .swiper-pagination { 218 .swiper-pagination {
211 bottom: 0px !important; 219 bottom: 0px !important;
212 } 220 }
213 221
214 .swiper-button-next { 222 .swiper-button-next {
215 background-image: url('../img/derecha.png'); 223 background-image: url('../img/derecha.png');
216 &:hover{ 224 &:hover{
217 filter:drop-shadow(4px 4px 4px gray); 225 filter:drop-shadow(4px 4px 4px gray);
218 } 226 }
219 } 227 }
220 228
221 .swiper-button-prev { 229 .swiper-button-prev {
222 background-image: url('../img/izquierda.png'); 230 background-image: url('../img/izquierda.png');
223 &:hover{ 231 &:hover{
224 filter:drop-shadow(4px 4px 4px gray); 232 filter:drop-shadow(4px 4px 4px gray);
225 } 233 }
226 } 234 }
227 @media (min-width: 992px){ 235 @media (min-width: 992px){
228 a{ 236 a{
229 margin-top: 2.5rem; 237 margin-top: 2.5rem;
230 } 238 }
231 } 239 }
232 } 240 }
233 241
src/sass/general.scss
1 @import 'constants'; 1 @import 'constants';
2 @import 'admin-seguimiento'; 2 @import 'admin-seguimiento';
3 @import 'bootstrap'; 3 @import 'bootstrap';
4 @import 'botonera'; 4 @import 'botonera';
5 @import 'botonera-lateral'; 5 @import 'botonera-lateral';
6 @import 'botonera-principal'; 6 @import 'botonera-principal';
7 @import 'botonera-secundaria'; 7 @import 'botonera-secundaria';
8 @import 'contenedor'; 8 @import 'contenedor';
9 @import 'lista'; 9 @import 'lista';
10 @import 'login'; 10 @import 'login';
11 @import 'panel-informativo'; 11 @import 'panel-informativo';
12 @import 'tabla'; 12 @import 'tabla';
13 @import 'teclado'; 13 @import 'teclado';
14 @import 'tabla-articulos'; 14 @import 'tabla-articulos';
15 @import 'acciones-mobile'; 15 @import 'acciones-mobile';
16 @import 'swiper'; 16 @import 'swiper';
17 @import 'foca-crear'; 17 @import 'foca-crear';
18 @import 'logistica-pedido-ruta'; 18 @import 'logistica-pedido-ruta';
19 @import 'tabs'; 19 @import 'tabs';
20 @import 'grid'; 20 @import 'grid';
21 @import 'paginador-abm'; 21 @import 'paginador-abm';
22 @import 'table-autorizar-nota-pedido'; 22 @import 'table-autorizar-nota-pedido';
23 23
24 24
25 //OCULTA FLECHAS INPUT NUMBER 25 //OCULTA FLECHAS INPUT NUMBER
26 input[type='number'] { 26 input[type='number'] {
27 -moz-appearance:textfield; 27 -moz-appearance:textfield;
28 } 28 }
29 29
30 input::-webkit-outer-spin-button, 30 input::-webkit-outer-spin-button,
31 input::-webkit-inner-spin-button { 31 input::-webkit-inner-spin-button {
32 -webkit-appearance: none; 32 -webkit-appearance: none;
33 } 33 }
34 34
35 .d-md-grid{ 35 .d-md-grid{
36 @media (min-width: 768px) { 36 @media (min-width: 768px) {
37 display: grid !important; 37 display: grid !important;
38 } 38 }
39 } 39 }
40 40
41 .btn-outline-debo{ 41 .btn-outline-debo{
42 background-color: transparent; 42 background-color: transparent;
43 color: $primary; 43 color: $primary;
44 border-color: $primary; 44 border-color: $primary;
45 &:hover{ 45 &:hover{
46 color: #FFF; 46 color: #FFF;
47 border-color: transparent; 47 border-color: transparent;
48 background-color: $primary; 48 background-color: $primary;
49 } 49 }
50 &:focus { 50 &:focus {
51 box-shadow: 0px 0px 0px 3px $primaryTransparency !important; 51 box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
52 } 52 }
53 &:active { 53 &:active {
54 color: #FFF; 54 color: #FFF;
55 background-color: $primary !important; 55 background-color: $primary !important;
56 box-shadow: 0px 0px 0px 3px $primaryTransparency !important; 56 box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
57 } 57 }
58 } 58 }
59 59
60 .input-group-append > button { 60 .input-group-append > button {
61 &:focus { 61 &:focus {
62 border-color: $primary !important; 62 border-color: $primary !important;
63 box-shadow: 0 0 5px $primary !important; 63 box-shadow: 0 0 5px $primary !important;
64 } 64 }
65 &:active { 65 &:active {
66 border-color: $primary !important; 66 border-color: $primary !important;
67 box-shadow: 0 0 5px $primary !important; 67 box-shadow: 0 0 5px $primary !important;
68 } 68 }
69 } 69 }
70 70
71 .input-group-append > button { 71 .input-group-append > button {
72 &:focus { 72 &:focus {
73 border-color: $primary !important; 73 border-color: $primary !important;
74 box-shadow: 0 0 5px $primary !important; 74 box-shadow: 0 0 5px $primary !important;
75 } 75 }
76 &:active { 76 &:active {
77 border-color: $primary !important; 77 border-color: $primary !important;
78 box-shadow: 0 0 5px $primary !important; 78 box-shadow: 0 0 5px $primary !important;
79 } 79 }
80 } 80 }
81 81
82 82
83 .btn-login { 83 .btn-login {
84 box-shadow: none !important; 84 box-shadow: none !important;
85 } 85 }
86 86
87 input[type="file"] { 87 input[type="file"] {
88 display: none; 88 display: none;
89 } 89 }
90 .custom-file-upload { 90 .custom-file-upload {
91 border: 1px solid #ccc; 91 border: 1px solid #ccc;
92 display: inline-block; 92 display: inline-block;
93 padding: 6px 12px; 93 padding: 6px 12px;
94 cursor: pointer; 94 cursor: pointer;
95 } 95 }
96 96
97 .btn-brown { 97 .btn-brown {
98 background-color:$primary; 98 background-color:$primary;
99 -webkit-appearance: none; 99 -webkit-appearance: none;
100 border-color: transparent; 100 border-color: transparent;
101 &:focus { 101 &:focus {
102 outline: 0 !important; 102 outline: 0 !important;
103 box-shadow: none; 103 box-shadow: none;
104 } 104 }
105 .icon-white { 105 .icon-white {
106 color: white; 106 color: white;
107 } 107 }
108 } 108 }
109 109
110 .btn-Guardar { 110 .btn-Guardar {
111 background-color:green; 111 background-color:green;
112 -webkit-appearance: none; 112 -webkit-appearance: none;
113 border-color: transparent; 113 border-color: transparent;
114 &:focus { 114 &:focus {
115 outline: 0 !important; 115 outline: 0 !important;
116 box-shadow: none; 116 box-shadow: none;
117 } 117 }
118 .icon-white { 118 .icon-white {
119 color: white; 119 color: white;
120 } 120 }
121 } 121 }
122 122
123 .page-item.active .page-link { 123 .page-item.active .page-link {
124 z-index: 1; 124 z-index: 1;
125 color: #fff; 125 color: #fff;
126 background-color: $primary; 126 background-color: $primary;
127 border-color: $primary; 127 border-color: $primary;
128 } 128 }
129 129
130 .foca-input { 130 .foca-input {
131 &:focus { 131 &:focus {
132 border-color: $primary; 132 border-color: $primary;
133 box-shadow: 0 0 5px $primary; 133 box-shadow: 0 0 5px $primary;
134 } 134 }
135 } 135 }
136 136
137 .btn-enviar {
138 background-color: white;
139 border-color: #cd9035;
140 &:focus {
141 box-shadow: none !important;
142 }
143 &:hover {
144 border-color: $primaryTransparency !important;
145 background-color: $primaryTransparency !important;
146 }
147 &:active{
148 background-color: $primary !important;
149 box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
150 }
151 }
152
137 .btn-primary { 153 .btn-primary {
138 background-color: $primary !important; 154 background-color: $primary !important;
139 border-color: $primary !important; 155 border-color: $primary !important;
140 &:focus { 156 &:focus {
141 box-shadow: none !important; 157 box-shadow: none !important;
142 } 158 }
143 &:hover { 159 &:hover {
144 border-color: $primaryTransparency !important; 160 border-color: $primaryTransparency !important;
145 background-color: $primaryTransparency !important; 161 background-color: $primaryTransparency !important;
146 } 162 }
147 &:active{ 163 &:active{
148 background-color: $primary !important; 164 background-color: $primary !important;
149 box-shadow: 0px 0px 0px 3px $primaryTransparency !important; 165 box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
150 } 166 }
151 } 167 }
152 168
153 .btn-default { 169 .btn-default {
154 color: #FFF; 170 color: #FFF;
155 background-color: $default !important; 171 background-color: $default !important;
156 border-color: $default !important; 172 border-color: $default !important;
157 &:focus { 173 &:focus {
158 box-shadow: none !important; 174 box-shadow: none !important;
159 } 175 }
160 &:hover { 176 &:hover {
161 color: #FFF; 177 color: #FFF;
162 border-color: $defaultTransparency !important; 178 border-color: $defaultTransparency !important;
163 background-color: $defaultTransparency !important; 179 background-color: $defaultTransparency !important;
164 } 180 }
165 &:active{ 181 &:active{
166 background-color: $default !important; 182 background-color: $default !important;
167 box-shadow: 0px 0px 0px 3px $defaultTransparency !important; 183 box-shadow: 0px 0px 0px 3px $defaultTransparency !important;
168 } 184 }
169 } 185 }
170 186
171 .btn-danger { 187 .btn-danger {
172 &:hover { 188 &:hover {
173 color: #FFF; 189 color: #FFF;
174 border-color: $dangerTransparency !important; 190 border-color: $dangerTransparency !important;
175 background-color: $dangerTransparency !important; 191 background-color: $dangerTransparency !important;
176 } 192 }
177 } 193 }
178 194
179 .table-celda-total { 195 .table-celda-total {
180 background-color: $highlightedArea; 196 background-color: $highlightedArea;
181 } 197 }
182 198
183 marquee { 199 marquee {
184 background-color: $highlightedArea; 200 background-color: $highlightedArea;
185 } 201 }
186 202
187 .front-index{ 203 .front-index{
188 z-index: 9999; 204 z-index: 9999;
189 } 205 }
190 206
191 .uib-daypicker{ 207 .uib-daypicker{
192 outline: 0 208 outline: 0
193 } 209 }
194 210
195 .right-0{ 211 .right-0{
196 right: 0; 212 right: 0;
197 } 213 }
198 214
199 .tabla-factura{ 215 .tabla-factura{
200 word-wrap: break-word; 216 word-wrap: break-word;
201 table-layout: fixed; 217 table-layout: fixed;
202 } 218 }
203 219
204 .ladda-w-100 .ladda-label{ 220 .ladda-w-100 .ladda-label{
205 width: 100%; 221 width: 100%;
206 float: right; 222 float: right;
207 } 223 }
208 224
209 .btn-delete-image{ 225 .btn-delete-image{
210 height: 25px; 226 height: 25px;
211 width: 25px; 227 width: 25px;
212 top: -10px; 228 top: -10px;
213 right: 0; 229 right: 0;
214 } 230 }
215 231
216 button.clear-input{ 232 button.clear-input{
217 cursor: pointer; 233 cursor: pointer;
218 background: transparent; 234 background: transparent;
219 border: none; 235 border: none;
220 margin-left: -24px; 236 margin-left: -24px;
221 z-index: 9; 237 z-index: 9;
222 color: #a3a3a3; 238 color: #a3a3a3;
223 &:focus{ 239 &:focus{
224 outline: none; 240 outline: none;
225 } 241 }
226 } 242 }
227 .custom-control-input { 243 .custom-control-input {
228 &:checked ~ .custom-control-label::before { 244 &:checked ~ .custom-control-label::before {
229 border: none !important; 245 border: none !important;
230 color: $primary !important; 246 color: $primary !important;
231 background-color: $primary !important; 247 background-color: $primary !important;
232 box-shadow: 0px 0px 0px 2px $primaryTransparency !important; 248 box-shadow: 0px 0px 0px 2px $primaryTransparency !important;
233 } 249 }
234 &:active ~ .custom-control-label::before { 250 &:active ~ .custom-control-label::before {
235 border: none !important; 251 border: none !important;
236 color: $primary !important; 252 color: $primary !important;
237 background-color: $primary !important; 253 background-color: $primary !important;
238 } 254 }
239 &:focus ~ .custom-control-label::before { 255 &:focus ~ .custom-control-label::before {
240 border: none !important; 256 border: none !important;
241 box-shadow: 0px 0px 0px 2px $primaryTransparency !important; 257 box-shadow: 0px 0px 0px 2px $primaryTransparency !important;
242 } 258 }
243 &:focus:not(:checked) ~ .custom-control-label::before { 259 &:focus:not(:checked) ~ .custom-control-label::before {
244 border: none !important; 260 border: none !important;
245 } 261 }
246 &:not(:disabled):active ~ .custom-control-label::before { 262 &:not(:disabled):active ~ .custom-control-label::before {
247 border: none !important; 263 border: none !important;
248 color: $primary !important; 264 color: $primary !important;
249 box-shadow: 0px 0px 0px 2px $primaryTransparency !important; 265 box-shadow: 0px 0px 0px 2px $primaryTransparency !important;
250 } 266 }
251 &:hover ~ .custom-control-label::before { 267 &:hover ~ .custom-control-label::before {
252 border: none !important; 268 border: none !important;
253 background-color: $primaryTransparency; 269 background-color: $primaryTransparency;
254 } 270 }
255 } 271 }
256 272