From 40a9833e3ecadb47bd5f3f5190bf9d56126ac32e Mon Sep 17 00:00:00 2001
From: gerard <gerard@verdnatura.es>
Date: Thu, 21 Jun 2018 09:17:39 +0200
Subject: [PATCH] Revert texfield changes 	Bug #137

---
 .../core/src/components/textfield/style.scss   | 18 ------------------
 .../core/src/components/textfield/textfield.js |  6 ------
 2 files changed, 24 deletions(-)

diff --git a/client/core/src/components/textfield/style.scss b/client/core/src/components/textfield/style.scss
index 5ff112e314..181ad8d8b9 100644
--- a/client/core/src/components/textfield/style.scss
+++ b/client/core/src/components/textfield/style.scss
@@ -42,22 +42,4 @@ vn-textfield {
     .material-icons:hover {
         color: rgba(0,0,0, .87);
     }
-
-    & > div.container > div.textField > div.infix.invalid{
-        @extend div.selected;
-
-        & > span.mdl-textfield__error{
-            visibility: visible;
-            margin-top: 9px;
-        }
-        & > label{
-            color: #d50000;
-        }
-    }
-
-    .infix.invalid + .underline {
-        &{
-            background-color: #d50000;
-        }
-    }
 }
\ No newline at end of file
diff --git a/client/core/src/components/textfield/textfield.js b/client/core/src/components/textfield/textfield.js
index b566b45b4d..56fc239553 100644
--- a/client/core/src/components/textfield/textfield.js
+++ b/client/core/src/components/textfield/textfield.js
@@ -21,13 +21,7 @@ export default class Textfield extends Input {
     set value(value) {
         this._value = (value === undefined || value === '') ? null : value;
         this.input.value = this._value;
-<<<<<<< HEAD
-        this.hasValue = this._value !== null;
-        if (this.hasValue) this.element.classList.add('not-empty');
-        else this.element.classList.remove('not-empty');
-=======
         this.hasValue = Boolean(this._value);
->>>>>>> parent of 97c994b... Bug #137 Refactorización Textfield
         this.mdlUpdate();
     }