diff --git a/.eslintrc b/.eslintrc
index 1b11bd11..50fa67e3 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -221,9 +221,7 @@
"react/no-unknown-property": 1,
"react/prop-types": [2, {"ignore": ["onMouseDown", "onTouchStart"]}],
"react/react-in-jsx-scope": 1,
- "react/require-extension": 1,
"react/self-closing-comp": 1,
- "react/sort-comp": 1,
- "react/wrap-multilines": 1
+ "react/sort-comp": 1
}
}
diff --git a/.sass-lint.yml b/.sass-lint.yml
index 2d330c76..abd6057e 100644
--- a/.sass-lint.yml
+++ b/.sass-lint.yml
@@ -49,7 +49,6 @@ rules:
convention: hyphenatedlowercase
mixins-before-declarations: 0
nesting-depth: 0
- no-color-keyword: 1
no-color-literals: 0
no-css-comments: 1
no-debug: 1
@@ -73,9 +72,6 @@ rules:
no-trailing-zero: 1
no-url-protocols: 1
placeholder-in-extend: 0
- placeholder-name-format:
- - 0
- - convention: hyphenatedlowercase
property-sort-order:
- 1
- ignore-custom-properties: false
diff --git a/components/input/Input.js b/components/input/Input.js
index b0e4b70a..4038bef5 100644
--- a/components/input/Input.js
+++ b/components/input/Input.js
@@ -177,7 +177,7 @@ const factory = (FontIcon) => {
{React.createElement(multiline ? 'textarea' : 'input', inputElementProps)}
{icon ?
: null}
-
+
{labelText
?