From 8f84784913e60921ca547fd449aed54f1e536c5a Mon Sep 17 00:00:00 2001
From: Miles Malerba <mmalerba@google.com>
Date: Wed, 22 Mar 2017 11:54:05 -0700
Subject: [PATCH 1/2] fix(input): change dividerColor to color

---
 src/demo-app/input/input-demo.html | 2 +-
 src/lib/input/input-container.html | 8 ++++----
 src/lib/input/input-container.ts   | 7 ++++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/demo-app/input/input-demo.html b/src/demo-app/input/input-demo.html
index 7559ddf3891e..2d029e7f643e 100644
--- a/src/demo-app/input/input-demo.html
+++ b/src/demo-app/input/input-demo.html
@@ -178,7 +178,7 @@ <h4>Textarea</h4>
     </p>
     <p>
       <md-checkbox [(ngModel)]="dividerColor">Check to change the divider color:</md-checkbox>
-      <md-input-container [dividerColor]="dividerColor ? 'primary' : 'accent'">
+      <md-input-container [color]="dividerColor ? 'primary' : 'accent'">
         <input mdInput [placeholder]="dividerColor ? 'Primary color' : 'Accent color'">
       </md-input-container>
     </p>
diff --git a/src/lib/input/input-container.html b/src/lib/input/input-container.html
index cefe5a06f8d1..324cc9378714 100644
--- a/src/lib/input/input-container.html
+++ b/src/lib/input/input-container.html
@@ -13,8 +13,8 @@
                [attr.for]="_mdInputChild.id"
                [class.mat-empty]="_mdInputChild.empty && !_shouldAlwaysFloat"
                [class.mat-float]="_canPlaceholderFloat"
-               [class.mat-accent]="dividerColor == 'accent'"
-               [class.mat-warn]="dividerColor == 'warn'"
+               [class.mat-accent]="color == 'accent'"
+               [class.mat-warn]="color == 'warn'"
                *ngIf="_hasPlaceholder()">
           <ng-content select="md-placeholder, mat-placeholder"></ng-content>
           {{_mdInputChild.placeholder}}
@@ -32,8 +32,8 @@
   <div class="mat-input-underline"
        [class.mat-disabled]="_mdInputChild.disabled">
     <span class="mat-input-ripple"
-          [class.mat-accent]="dividerColor == 'accent'"
-          [class.mat-warn]="dividerColor == 'warn'"></span>
+          [class.mat-accent]="color == 'accent'"
+          [class.mat-warn]="color == 'warn'"></span>
   </div>
 
   <div *ngIf="hintLabel != ''" [attr.id]="_hintLabelId" class="mat-hint">{{hintLabel}}</div>
diff --git a/src/lib/input/input-container.ts b/src/lib/input/input-container.ts
index bbc7c0a15b91..7361314c3fb0 100644
--- a/src/lib/input/input-container.ts
+++ b/src/lib/input/input-container.ts
@@ -255,7 +255,12 @@ export class MdInputContainer implements AfterContentInit {
   @Input() align: 'start' | 'end' = 'start';
 
   /** Color of the input divider, based on the theme. */
-  @Input() dividerColor: 'primary' | 'accent' | 'warn' = 'primary';
+  @Input() color: 'primary' | 'accent' | 'warn' = 'primary';
+
+  /** @deprecated Use color instead. */
+  @Input()
+  get dividerColor() { return this.color; }
+  set dividerColor(value) { this.color = value; }
 
   /** Whether the floating label should always float or not. */
   get _shouldAlwaysFloat() { return this._floatPlaceholder === 'always'; };

From 09c7094c97f9d285471fce6c393f110bc11a3c30 Mon Sep 17 00:00:00 2001
From: Miles Malerba <mmalerba@google.com>
Date: Thu, 23 Mar 2017 09:56:39 -0700
Subject: [PATCH 2/2] change over docs and demo usages

---
 src/demo-app/input/input-demo.html | 20 ++++++++++----------
 src/demo-app/input/input-demo.ts   |  2 +-
 src/lib/input/input.md             |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/demo-app/input/input-demo.html b/src/demo-app/input/input-demo.html
index 2d029e7f643e..3b2c41a91f7e 100644
--- a/src/demo-app/input/input-demo.html
+++ b/src/demo-app/input/input-demo.html
@@ -74,24 +74,24 @@ <h4>Icons</h4>
   <md-toolbar color="primary">Divider Colors</md-toolbar>
   <md-card-content>
     <h4>Input</h4>
-    <md-input-container dividerColor="primary" >
+    <md-input-container color="primary" >
       <input mdInput placeholder="Default Color" value="example">
     </md-input-container>
-    <md-input-container dividerColor="accent">
+    <md-input-container color="accent">
       <input mdInput placeholder="Accent Color" value="example">
     </md-input-container>
-    <md-input-container dividerColor="warn">
+    <md-input-container color="warn">
       <input mdInput placeholder="Warn Color" value="example">
     </md-input-container>
 
     <h4>Textarea</h4>
-    <md-input-container dividerColor="primary">
+    <md-input-container color="primary">
       <textarea mdInput placeholder="Default Color">example</textarea>
     </md-input-container>
-    <md-input-container dividerColor="accent">
+    <md-input-container color="accent">
       <textarea mdInput placeholder="Accent Color">example</textarea>
     </md-input-container>
-    <md-input-container dividerColor="warn">
+    <md-input-container color="warn">
       <textarea mdInput placeholder="Warn Color">example</textarea>
     </md-input-container>
   </md-card-content>
@@ -128,7 +128,7 @@ <h4>Textarea</h4>
 <md-card class="demo-card demo-basic">
   <md-toolbar color="primary">
     Hello&nbsp;
-    <md-input-container dividerColor="accent">
+    <md-input-container color="accent">
       <input mdInput [(ngModel)]="name" type="text" placeholder="First name">
     </md-input-container>,
     how are you?
@@ -177,9 +177,9 @@ <h4>Textarea</h4>
       </md-input-container>
     </p>
     <p>
-      <md-checkbox [(ngModel)]="dividerColor">Check to change the divider color:</md-checkbox>
-      <md-input-container [color]="dividerColor ? 'primary' : 'accent'">
-        <input mdInput [placeholder]="dividerColor ? 'Primary color' : 'Accent color'">
+      <md-checkbox [(ngModel)]="color">Check to change the color:</md-checkbox>
+      <md-input-container [color]="color ? 'primary' : 'accent'">
+        <input mdInput [placeholder]="color ? 'Primary color' : 'Accent color'">
       </md-input-container>
     </p>
     <p>
diff --git a/src/demo-app/input/input-demo.ts b/src/demo-app/input/input-demo.ts
index e8fb5838141c..58135ee8fbb2 100644
--- a/src/demo-app/input/input-demo.ts
+++ b/src/demo-app/input/input-demo.ts
@@ -12,7 +12,7 @@ let max = 5;
 })
 export class InputDemo {
   floatingLabel: string = 'auto';
-  dividerColor: boolean;
+  color: boolean;
   requiredField: boolean;
   ctrlDisabled = false;
 
diff --git a/src/lib/input/input.md b/src/lib/input/input.md
index 9e17b3baf7bb..e30161462396 100644
--- a/src/lib/input/input.md
+++ b/src/lib/input/input.md
@@ -66,9 +66,9 @@ Hint labels are specified in one of two ways: either using the `hintLabel` attri
 `align` attribute containing the side. The attribute version is assumed to be at the `start`.
 Specifying a side twice will result in an exception during initialization.
 
-### Divider Color
+### Underline Color
 
-The divider (line under the `input` content) color can be changed by using the `dividerColor`
+The underline (line under the `input` content) color can be changed by using the `color`
 attribute of `md-input-container`. A value of `primary` is the default and will correspond to the
 theme primary color. Alternatively, `accent` or `warn` can be specified to use the theme's accent or
 warn color.