Florencia Cazzola / wrapper-demo

Download as
Browse Code ยป

Commit 5a71611b52b9346703207bb1bcdf2ca7b755dd0b

Authored by Eric Fernandez
2 parents d54f55b3dd 448abff610
Exists in master and in 1 other branch develop

Merge branch 'develop' into 'master' 

Develop

See merge request !104
Showing 28 changed files   Show diff stats

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
Diff comments   View file @ 5a71611

3.74 KB | W: | H:

6.88 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
img/abmVendedorCobrador.png
Diff comments   View file @ 5a71611

5.6 KB | W: | H:

3.47 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
img/agendarVisita.png
Diff comments   View file @ 5a71611

4.07 KB | W: | H:

7.3 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
img/autorizarNota.png
Diff comments   View file @ 5a71611

5.52 KB

6.07 KB | W: | H:

7.03 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

8.43 KB
img/control_stock.png
Diff comments   View file @ 5a71611

7.77 KB

6.62 KB

7.27 KB

256 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
Diff comments   View file @ 5a71611

12.1 KB | W: | H:

23.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
img/seguimientoHojaRuta.png
Diff comments   View file @ 5a71611

11.8 KB | W: | H:

8.57 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
img/seguimientoNotaPedido.png
Diff comments   View file @ 5a71611

12 KB | W: | H:

19.5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -47,6 +47,7 @@
47 47 <script src="./node_modules/foca-activar-hoja-ruta/dist/foca-activar-hoja-ruta.min.js"></script>
48 48 <script src="./node_modules/foca-admin-seguimiento/dist/foca-admin-seguimiento.min.js"></script>
49 49 <script src="./node_modules/foca-agendar-visita/dist/foca-agendar-visita.min.js"></script>
  50 + <script src="./node_modules/foca-autorizar-nota-pedido/dist/foca-autorizar-nota-pedido.min.js"></script>
50 51 <script src="./node_modules/foca-botonera-facturador/dist/foca-botonera-facturador.min.js"></script>
51 52 <script src="./node_modules/foca-botonera-lateral/dist/foca-botonera-lateral.min.js"></script>
52 53 <script src="./node_modules/foca-botonera-principal/dist/foca-botonera-principal.min.js"></script>
... ... @@ -44,6 +44,7 @@
44 44 "foca-activar-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-activar-hoja-ruta.git",
45 45 "foca-admin-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-admin-seguimiento.git",
46 46 "foca-agendar-visita": "git+ssh://git@debonline.dyndns.org:npm/foca-agendar-visita.git",
  47 + "foca-autorizar-nota-pedido": "git+ssh://git@debonline.dyndns.org:npm/foca-autorizar-nota-pedido.git",
47 48 "foca-botonera-facturador": "git+ssh://git@debonline.dyndns.org:npm/foca-botonera-facturador.git",
48 49 "foca-botonera-lateral": "git+ssh://git@debonline.dyndns.org:npm/foca-botonera-lateral.git",
49 50 "foca-botonera-principal": "git+ssh://git@debonline.dyndns.org:npm/foca-botonera-principal.git",
... ... @@ -96,7 +97,7 @@
96 97 "gulp-htmlmin": "^5.0.1",
97 98 "gulp-sequence": "^1.0.0",
98 99 "gulp-uglify-es": "^1.0.4",
99   - "jquery": "^3.3.1",
  100 + "jquery": "^3.4.0",
100 101 "jszip": "2.6.1",
101 102 "ladda": "1.0.6",
102 103 "leaflet": "1.3.4",
... ... @@ -119,7 +120,7 @@
119 120 "gulp-sass": "^4.0.1",
120 121 "gulp-uglify": "^3.0.2",
121 122 "gulp-watch": "^5.0.1",
122   - "jasmine-core": "^3.3.0",
  123 + "jasmine-core": "^3.4.0",
123 124 "jshint": "^2.10.2",
124 125 "pre-commit": "^1.2.2",
125 126 "pump": "^3.0.0"
... ... @@ -22,6 +22,7 @@ angular.module(&#39;appWrapperDemo&#39;, [
22 22 'focaActivarHojaRuta',
23 23 'focaAdminSeguimiento',
24 24 'focaAgendarVisita',
  25 + 'focaAutorizarHojaRuta',
25 26 'focaBotoneraFacturador',
26 27 'focaBotoneraLateral',
27 28 'focaBotoneraPrincipal',
src/sass/_botonera-principal.scss
Diff comments   View file @ 5a71611
... ... @@ -36,10 +36,12 @@
36 36 }
37 37 }
38 38 &-logo {
39   - width: 80%;
  39 + width: 100%;
  40 + margin-left: 50%;
40 41 opacity: .8;
41 42 @media (max-width: 576px) {
42   - width: 100%;
  43 + width: 180%;
  44 + margin-left: 20%;
43 45 }
44 46 }
45 47 &-vacio {
... ... @@ -74,6 +76,24 @@
74 76 }
75 77 }
76 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 + }
77 97 &-facturador {
78 98 & button {
79 99 background-position: -270px 0px;
... ... @@ -84,25 +104,28 @@
84 104 }
85 105 &-nota-pedido {
86 106 & button {
87   - background-position: -1250px 0px;
  107 + background-image: url('../img/notaPedido.png');
  108 + background-size: 90px 90px;
88 109 &:hover {
89   - background-position: -1250px -90px;
  110 + background-color: rgb(250,250,250);
90 111 }
91 112 }
92 113 }
93 114 &-remito {
94 115 & button {
95   - background-position: -4560px 0px;
  116 + background-image: url('../img/remito.png');
  117 + background-size: 90px 90px;
96 118 &:hover {
97   - background-position: -4560px -90px;
  119 + background-color: rgb(250,250,250);
98 120 }
99 121 }
100 122 }
101 123 &-hoja-ruta {
102 124 & button {
103   - background-position: -4650px 0px;
  125 + background-image: url('../img/hoja-ruta.png');
  126 + background-size: 86px 90px;
104 127 &:hover {
105   - background-position: -4650px -90px;
  128 + background-color: rgb(250,250,250);
106 129 }
107 130 }
108 131 }
... ... @@ -119,7 +142,7 @@
119 142 & button {
120 143 background-image: url('../img/seguimientoNotaPedido.png');
121 144 background-size: 90px 90px;
122   - background-position: 15px 10px;
  145 + // background-position: 15px 10px;
123 146 &:hover {
124 147 background-color: rgb(250,250,250);
125 148 }
... ... @@ -129,7 +152,7 @@
129 152 & button {
130 153 background-image: url('../img/seguimientoHojaRuta.png');
131 154 background-size: 90px 90px;
132   - background-position: 15px 10px;
  155 + // background-position: 15px 10px;
133 156 &:hover {
134 157 background-color: rgb(250,250,250);
135 158 }
... ... @@ -137,9 +160,11 @@
137 160 }
138 161 &-cobranzas {
139 162 & button {
140   - background-position: -1880 0px;
  163 + background-image: url('../img/cobranzas.png');
  164 + background-size: 90px 90px;
  165 + // background-position: 15px 10px;
141 166 &:hover {
142   - background-position: -1880 -90px;
  167 + background-color: rgb(250,250,250);
143 168 }
144 169 }
145 170 }
... ... @@ -147,7 +172,7 @@
147 172 & button {
148 173 background-image: url('../img/seguimientoCobranza.png');
149 174 background-size: 90px 90px;
150   - background-position: 15px 10px;
  175 + // background-position: 15px 10px;
151 176 &:hover {
152 177 background-color: rgb(250,250,250);
153 178 }
... ... @@ -185,6 +210,7 @@
185 210 background-image: url('../img/agendarVisita.png');
186 211 background-size: 90px 90px;
187 212 &:hover {
  213 + box-shadow: 2px;
188 214 background-color: rgb(250,250,250);
189 215 }
190 216 }
... ... @@ -207,6 +233,15 @@
207 233 }
208 234 }
209 235 }
  236 + &-autorizar-nota {
  237 + & button {
  238 + background-image: url('../img/autorizarNota.png');
  239 + background-size: 90px 90px;
  240 + &:hover {
  241 + background-color: rgb(250,250,250);
  242 + }
  243 + }
  244 + }
210 245 .swiper-pagination {
211 246 bottom: 0px !important;
212 247 }
src/sass/_botonera-secundaria.scss
Diff comments   View file @ 5a71611
... ... @@ -10,7 +10,6 @@
10 10 margin-right: 1px;
11 11 width: calc(100% - 1px);
12 12 margin-bottom: 1px;
13   -
14 13 &:hover{
15 14 background-color: #cd903550 ;
16 15 border-color: #cd9035 !important;
... ... @@ -19,7 +18,7 @@
19 18 box-shadow: 0 0 0 0.2rem rgb(216, 176, 125);
20 19 }
21 20 img{
22   - width: 50%;
  21 + width: 40%;
23 22 margin: auto
24 23 }
25 24 span{
src/sass/_login.scss
Diff comments   View file @ 5a71611
... ... @@ -35,7 +35,6 @@
35 35 }
36 36 }
37 37  
38   -
39 38 &-button {
40 39 width: 80%;
41 40 background-color: #cd9035;
src/sass/_logistica-pedido-ruta.scss
Diff comments   View file @ 5a71611
... ... @@ -22,7 +22,7 @@
22 22 width: 100%;
23 23 height: 100%;
24 24 border-radius: 50%;
25   - border: 12px solid #fff;
  25 + border: 8px solid #fff;
26 26 position: absolute;
27 27 top: 0;
28 28 left: 0;
... ... @@ -42,7 +42,7 @@
42 42 width: 100%;
43 43 height: 100%;
44 44 background: none;
45   - border-width: 12px;
  45 + border-width: 8px;
46 46 border-style: solid;
47 47 position: absolute;
48 48 top: 0;
... ... @@ -72,7 +72,7 @@
72 72 height: 90%;
73 73 border-radius: 50%;
74 74 background: #44484b;
75   - font-size: 24px;
  75 + font-size: 20px;
76 76 color: #fff;
77 77 line-height: 20px;
78 78 text-align: center;
src/sass/_swiper.scss
Diff comments   View file @ 5a71611
1 1 .swiper {
2 2 &-container {
3 3 height: 300px;
4   -
5 4 }
6 5 &-slide {
7 6 background: transparent;
... ... @@ -21,3 +20,8 @@
21 20 }
22 21 }
23 22 }
  23 +
  24 +.swiper-pagination-bullet-active {
  25 + opacity: 1;
  26 + background: #CD9035;
  27 +}
src/sass/_table-autorizar-nota-pedido.scss
Diff comments   View file @ 5a71611
... ... @@ -0,0 +1,13 @@
  1 +.tabla-autorizar-nota-pedido {
  2 +
  3 + thead > tr > th {
  4 + background-color: #67615e;
  5 + color: #FFF;
  6 + }
  7 +
  8 + tfoot > tr > th {
  9 + background-color: #67615e;
  10 + color: #FFF;
  11 + }
  12 +
  13 +}
src/sass/general.scss
Diff comments   View file @ 5a71611
... ... @@ -19,12 +19,14 @@ $primary-color: #e09125;
19 19 @import 'tabs';
20 20 @import 'grid';
21 21 @import 'paginador-abm';
  22 +@import 'table-autorizar-nota-pedido';
22 23  
23 24  
24 25 //OCULTA FLECHAS INPUT NUMBER
25 26 input[type='number'] {
26 27 -moz-appearance:textfield;
27 28 }
  29 +
28 30 input::-webkit-outer-spin-button,
29 31 input::-webkit-inner-spin-button {
30 32 -webkit-appearance: none;
... ... @@ -47,6 +49,64 @@ input::-webkit-inner-spin-button {
47 49 }
48 50 }
49 51  
  52 +.btn-brown {
  53 + background-color:#Cd9035;
  54 + -webkit-appearance: none;
  55 + border-color: transparent;
  56 + &:focus {
  57 + outline: 0 !important;
  58 + box-shadow: none;
  59 + }
  60 + .icon-white {
  61 + color: white;
  62 + }
  63 +}
  64 +
  65 +
  66 +.page-item.active .page-link {
  67 + z-index: 1;
  68 + color: #fff;
  69 + background-color: #Cd9035;
  70 + border-color: #Cd9035;
  71 +}
  72 +
  73 +.foca-input {
  74 + &:focus {
  75 + border-color: #Cd9035;
  76 + box-shadow: 0 0 5px #Cd9035;
  77 + }
  78 +}
  79 +
  80 +.btn-info {
  81 + background-color: #Cd9035;
  82 + border-color: #Cd9035;
  83 + &:focus {
  84 + box-shadow: none;
  85 + }
  86 + &:hover {
  87 + background-color: #Cd9035;
  88 + }
  89 +}
  90 +
  91 +.btn-primary {
  92 + background-color: #Cd9035;
  93 + border-color: #Cd9035;
  94 + &:focus {
  95 + box-shadow: none;
  96 + }
  97 + &:hover {
  98 + background-color: #Cd9035;
  99 + }
  100 +}
  101 +
  102 +.table-celda-total {
  103 + background-color: #E09524;
  104 +}
  105 +
  106 +marquee {
  107 + background-color: #E09524;
  108 +}
  109 +
50 110 .front-index{
51 111 z-index: 9999;
52 112 }