From 6e095d61ec4b7b98e5ac21bcb4d4f4ff70c63d29 Mon Sep 17 00:00:00 2001
From: Vicente Falco <vfalco@verdnatura.es>
Date: Mon, 2 Jan 2017 12:51:40 +0100
Subject: [PATCH] label overlap textbox

---
 @salix/core/src/mdl-override.css               |  4 ++++
 @salix/crud/src/client/basic-data/index.html   | 16 ++++++++--------
 @salix/package.json                            |  2 +-
 @salix/vendor/src/materialdesignlite-vendor.js |  6 +++---
 services/nginx/logs/error.log                  |  4 ++++
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/@salix/core/src/mdl-override.css b/@salix/core/src/mdl-override.css
index fedc643952..a06f49b6d5 100644
--- a/@salix/core/src/mdl-override.css
+++ b/@salix/core/src/mdl-override.css
@@ -19,4 +19,8 @@
 
 .mdl-button--raised:hover {
     background-color: #ffa410;
+}
+
+.mdl-textfield__label{
+    top: 0px;
 }
\ No newline at end of file
diff --git a/@salix/crud/src/client/basic-data/index.html b/@salix/crud/src/client/basic-data/index.html
index 447c8f0b3d..52227af0d1 100644
--- a/@salix/crud/src/client/basic-data/index.html
+++ b/@salix/crud/src/client/basic-data/index.html
@@ -1,20 +1,20 @@
 <form ng-submit="basicData.submit()"  pad-large>
     <vn-title>Datos básicos</vn-title>
     <vn-horizontal>
-        <vn-textfield  vn-one label="Nombre" model="basicData.client.name" entity="basicData"></vn-textfield>
-        <vn-textfield vn-one label="NIF/CIF" model="basicData.client.fi" entity="basicData"></vn-textfield>
+        <vn-textfield vn-one label="Nombre" model="basicData.client.name" entity="basicData" name="name"></vn-textfield>
+        <vn-textfield vn-one label="NIF/CIF" model="basicData.client.fi" entity="basicData" name="fi"></vn-textfield>
     </vn-horizontal>
     <vn-horizontal>
-        <vn-textfield autofocus vn-one label="Razón social" model="basicData.client.socialName" entity="basicData"></vn-textfield>
-        <vn-date-picker vn-one label="Fecha alta" model="basicData.client.dischargeDate" entity="basicData"></vn-date-picker>
+        <vn-textfield autofocus vn-one label="Razón social" model="basicData.client.socialName" entity="basicData" name="socialName"></vn-textfield>
+        <vn-date-picker vn-one label="Fecha alta" model="basicData.client.dischargeDate" entity="basicData" name="registerDate" ></vn-date-picker>
     </vn-horizontal>
     <vn-horizontal>
-        <vn-textfield vn-one label="Teléfono" model="basicData.client.telefono" entity="basicData"></vn-textfield>
-        <vn-textfield vn-one label="Fax" model="basicData.client.fax" entity="basicData"></vn-textfield>
-        <vn-textfield vn-one label="Email" model="basicData.client.email" entity="basicData"></vn-textfield>
+        <vn-textfield vn-one label="Teléfono" model="basicData.client.telefono" entity="basicData" name="phone"></vn-textfield>
+        <vn-textfield vn-one label="Fax" model="basicData.client.fax" entity="basicData" name="fax"></vn-textfield>
+        <vn-textfield vn-one label="Email" model="basicData.client.email" entity="basicData" name="email"></vn-textfield>
     </vn-horizontal>
     <vn-horizontal>
-        <vn-combo vn-one label="Comercial" model="basicData.client.salesPerson" entity="basicData">
+        <vn-combo vn-one label="Comercial" model="basicData.client.salesPerson" entity="basicData" name="comercial">
             <option ng-repeat="p in basicData.sales" value="{{p.id}}">{{p.name}}</ng-repeat>
         </vn-combo>
     </vn-horizontal>
diff --git a/@salix/package.json b/@salix/package.json
index b4e6068db0..e9520bc8d8 100644
--- a/@salix/package.json
+++ b/@salix/package.json
@@ -13,7 +13,7 @@
     "angular-translate": "^2.13.1",
     "angular-ui-router": "^1.0.0-beta.3",
     "express": "^4.14.0",
-    "material-design-lite": "^1.2.1",
+    "material-design-lite": "^1.3.0",
     "oclazyload": "^0.6.3"
   },
   "devDependencies": {
diff --git a/@salix/vendor/src/materialdesignlite-vendor.js b/@salix/vendor/src/materialdesignlite-vendor.js
index 7765281a99..ef28cb3a73 100644
--- a/@salix/vendor/src/materialdesignlite-vendor.js
+++ b/@salix/vendor/src/materialdesignlite-vendor.js
@@ -1,4 +1,4 @@
-import * as _materialdesignlite from 'material-design-lite';
-import * as css from 'material-design-lite/material.min.css';
-
+import * as _materialdesignlite from 'material-design-lite';
+import * as css from 'material-design-lite/material.min.css';
+
 export const materialdesignlite = _materialdesignlite;
\ No newline at end of file
diff --git a/services/nginx/logs/error.log b/services/nginx/logs/error.log
index 3b4e114bb7..ed37c24e6c 100644
--- a/services/nginx/logs/error.log
+++ b/services/nginx/logs/error.log
@@ -5,3 +5,7 @@
 2016/12/28 14:08:07 [notice] 7984#8980: signal process started
 2016/12/28 14:13:33 [notice] 10144#6644: signal process started
 2016/12/28 14:44:57 [notice] 3248#9176: signal process started
+2017/01/02 09:41:56 [notice] 9224#8900: signal process started
+2017/01/02 10:05:09 [notice] 2788#8880: signal process started
+2017/01/02 11:46:35 [notice] 8308#7808: signal process started
+2017/01/02 12:45:38 [notice] 8064#2328: signal process started