From a19f53d826faaa2e80a28dbc8c0b46122cc20c1b Mon Sep 17 00:00:00 2001
From: Barry Gribben <bgribben@gmail.com>
Date: Tue, 25 Aug 2015 15:14:54 +0100
Subject: [PATCH 1/2] Added hintStyle property

---
 docs/src/app/components/pages/components/text-fields.jsx | 4 ++++
 docs/src/app/components/raw-code/text-fields-code.txt    | 4 ++++
 src/text-field.jsx                                       | 4 +++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/src/app/components/pages/components/text-fields.jsx b/docs/src/app/components/pages/components/text-fields.jsx
index 825e3baefb0158..9199556254383b 100644
--- a/docs/src/app/components/pages/components/text-fields.jsx
+++ b/docs/src/app/components/pages/components/text-fields.jsx
@@ -210,6 +210,10 @@ let TextFieldsPage = React.createClass({
               <TextField
                 style={styles.textfield}
                 hintText="Hint Text" /><br/>
+              <TextField
+                style={styles.textField}
+                hintText="Styled Hint Text"
+                hintStyle={{color: 'red'}} /><br/>
               <TextField
                 style={styles.textfield}
                 hintText="Hint Text"
diff --git a/docs/src/app/components/raw-code/text-fields-code.txt b/docs/src/app/components/raw-code/text-fields-code.txt
index f7740a5ced62e5..d934fa3d8c8e40 100644
--- a/docs/src/app/components/raw-code/text-fields-code.txt
+++ b/docs/src/app/components/raw-code/text-fields-code.txt
@@ -1,6 +1,10 @@
 //In Line Hint Text
 <TextField
   hintText="Hint Text" />
+<TextField
+  style={styles.textField}
+  hintText="Styled Hint Text"
+  hintStyle={{color: 'red'}} />
 <TextField
   hintText="Hint Text"
   defaultValue="Default Value" />
diff --git a/src/text-field.jsx b/src/text-field.jsx
index ba2a3e706afdaf..5ea3333a26eb13 100644
--- a/src/text-field.jsx
+++ b/src/text-field.jsx
@@ -33,6 +33,7 @@ let TextField = React.createClass({
       React.PropTypes.string,
       React.PropTypes.element,
     ]),
+    hintStyle: React.PropTypes.object,
     id: React.PropTypes.string,
     inputStyle: React.PropTypes.object,
     multiLine: React.PropTypes.bool,
@@ -240,6 +241,7 @@ let TextField = React.createClass({
       floatingLabelText,
       fullWidth,
       hintText,
+      hintStyle,
       id,
       multiLine,
       onBlur,
@@ -259,7 +261,7 @@ let TextField = React.createClass({
     ) : null;
 
     let hintTextElement = hintText ? (
-      <div style={this.mergeAndPrefix(styles.hint)}>{hintText}</div>
+      <div style={this.mergeAndPrefix(styles.hint, this.props.hintStyle)}>{hintText}</div>
     ) : null;
 
     let floatingLabelTextElement = floatingLabelText ? (

From 839a02100463ad9fbd2c17ef6969224f7e082ece Mon Sep 17 00:00:00 2001
From: Barry Gribben <bgribben@gmail.com>
Date: Tue, 8 Sep 2015 09:29:10 +0100
Subject: [PATCH 2/2] Updated TextField docs to include hintStyle prop

---
 docs/src/app/components/pages/components/text-fields.jsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/src/app/components/pages/components/text-fields.jsx b/docs/src/app/components/pages/components/text-fields.jsx
index 9199556254383b..a93f965ca40ca7 100644
--- a/docs/src/app/components/pages/components/text-fields.jsx
+++ b/docs/src/app/components/pages/components/text-fields.jsx
@@ -79,6 +79,12 @@ let TextFieldsPage = React.createClass({
             header: 'optional',
             desc: 'If true, the field receives the property width 100%.'
           },
+          {
+            name: 'hintStyle',
+            type: 'object',
+            header: 'optional',
+            desc: 'Override the inline-styles of the TextField\'s hint text element.'
+          },
           {
             name: 'hintText',
             type: 'string',