Merge branch 'develop' of git.focasoftware.com:npm/wrapper-demo

Mauricio Cattafi
2 parents 5a91d2a68c c754f89c8a
Showing 12 changed files Show diff stats
gulpfile.js
img/Orden_de_Carga.png
img/chofer_secundario.png
img/fechaDeEntrega.png
img/graficar.png
img/hojaDeRuta.png
img/logo-foca.png
img/logofoca.png
img/remito_abierto.png
img/vehiculo_secundario.png
img/verCisterna.png
src/sass/_botonera-principal.scss
@@ -82,7 +82,7 @@ gulp.task(&#39;webserver&#39;, function() {
     pump [
         connect.server(
             {
-                port: 8086,
+                port: 4203,
                 host: '0.0.0.0',
                 livereload: true
             }
@@ -20,6 +20,7 @@
         position: relative;
         width: 90px;
         outline: 0;
+        transition: 0.3s;
         span {
             left: 0;
             position: absolute;
@@ -254,44 +255,41 @@
         }
     }
  
-    .btn-tareas-pausadas{
-        background-color: #cd9035;
-        border-color: #cd9035 !important;
-        height: 30px;
-        text-align: center;
-        width: 280px;
+    .btn-tareas-pausadas {
+        padding-left: 2rem;
+        padding-right: 2rem;
+        border-radius: 4px;
+        font-size: 14px;
+        width: auto;
+        height: 35px;
+        color: white;
         background-image: none;
-        flood-color: #ffffff;
-        &:hover {
-            background-color: #cd9035;
-        }
+        background-color: #cd9035;
+        transition: 0.3s;
+        &:hover,
         &:focus {
             background-color: #cd9035;
         }
     }
  
-    .dropdown-tareas-pausadas{
-        background: linear-gradient(0 ,#ffffff, #e6e6e6);
-        position: absolute;
-        will-change: transform;
-        top: 0px;
-        left: 0px;
-        transform: translate3d(0px, 0px, 0px);
-        margin-bottom: 5px;
+    .dropdown-tareas-pausadas {
         padding: 0px;
-        box-sizing: content-box;
-        border-radius: 12px;
-        font: small;
+        border-radius: 4px;
+        background: linear-gradient(0, #ffffff, #e6e6e6);
         transform: translate3d(0px, 30px, 0px);
+        box-sizing: content-box;
+        font-size: 12px;
+        transition: 0.3s;
     }
  
-    .items-dropdown{
-        background-color:rgba(0, 0, 0, 0);
-        cursor: hand;
-        &:hover {
+    .items-dropdown {
+        cursor: pointer;
+        width: auto;
+        background-color: rgba(0, 0, 0, 0);
+        transition: 0.3s;
+        &:hover,
+        &:focus {
             background-color: #e6e6e6;
-            width: 98%;
-            border-radius: 12px;
         }
     }
...	...	@@ -82,7 +82,7 @@ gulp.task('webserver', function() {
82	82	pump [
83	83	connect.server(
84	84	{
85		- port: 8086,
	85	+ port: 4203,
86	86	host: '0.0.0.0',
87	87	livereload: true
88	88	}
...	...	@@ -20,6 +20,7 @@
20	20	position: relative;
21	21	width: 90px;
22	22	outline: 0;
	23	+ transition: 0.3s;
23	24	span {
24	25	left: 0;
25	26	position: absolute;
...	...	@@ -254,44 +255,41 @@
254	255	}
255	256	}
256	257
257		- .btn-tareas-pausadas{
258		- background-color: #cd9035;
259		- border-color: #cd9035 !important;
260		- height: 30px;
261		- text-align: center;
262		- width: 280px;
	258	+ .btn-tareas-pausadas {
	259	+ padding-left: 2rem;
	260	+ padding-right: 2rem;
	261	+ border-radius: 4px;
	262	+ font-size: 14px;
	263	+ width: auto;
	264	+ height: 35px;
	265	+ color: white;
263	266	background-image: none;
264		- flood-color: #ffffff;
265		- &:hover {
266		- background-color: #cd9035;
267		- }
	267	+ background-color: #cd9035;
	268	+ transition: 0.3s;
	269	+ &:hover,
268	270	&:focus {
269	271	background-color: #cd9035;
270	272	}
271	273	}
272	274
273		- .dropdown-tareas-pausadas{
274		- background: linear-gradient(0 ,#ffffff, #e6e6e6);
275		- position: absolute;
276		- will-change: transform;
277		- top: 0px;
278		- left: 0px;
279		- transform: translate3d(0px, 0px, 0px);
280		- margin-bottom: 5px;
	275	+ .dropdown-tareas-pausadas {
281	276	padding: 0px;
282		- box-sizing: content-box;
283		- border-radius: 12px;
284		- font: small;
	277	+ border-radius: 4px;
	278	+ background: linear-gradient(0, #ffffff, #e6e6e6);
285	279	transform: translate3d(0px, 30px, 0px);
	280	+ box-sizing: content-box;
	281	+ font-size: 12px;
	282	+ transition: 0.3s;
286	283	}
287	284
288		- .items-dropdown{
289		- background-color:rgba(0, 0, 0, 0);
290		- cursor: hand;
291		- &:hover {
	285	+ .items-dropdown {
	286	+ cursor: pointer;
	287	+ width: auto;
	288	+ background-color: rgba(0, 0, 0, 0);
	289	+ transition: 0.3s;
	290	+ &:hover,
	291	+ &:focus {
292	292	background-color: #e6e6e6;
293		- width: 98%;
294		- border-radius: 12px;
295	293	}
296	294	}
297	295