From a95400d6b0ec8f7627b4d26fc15f346c0c8ab77e Mon Sep 17 00:00:00 2001
From: Miles Malerba <mmalerba@google.com>
Date: Tue, 21 Mar 2017 15:41:11 -0700
Subject: [PATCH 1/2] fix(input): baseline alignment on textarea

---
 src/demo-app/baseline/baseline-demo.html | 12 ++++++++++--
 src/lib/input/input-container.scss       |  3 +++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/demo-app/baseline/baseline-demo.html b/src/demo-app/baseline/baseline-demo.html
index 707b445e3c22..8b11f66c6857 100644
--- a/src/demo-app/baseline/baseline-demo.html
+++ b/src/demo-app/baseline/baseline-demo.html
@@ -11,7 +11,11 @@
     <md-radio-button value="option_3">Radio 3</md-radio-button>
     | Text 4 |
     <md-input-container>
-      <input mdInput placeholder="Input">
+      <input mdInput placeholder="Input" value="Text Input">
+    </md-input-container>
+    | Text 5 |
+    <md-input-container>
+      <textarea mdInput placeholder="Input">Textarea&#10;Line 2</textarea>
     </md-input-container>
     | Text After
   </md-card-content>
@@ -31,7 +35,11 @@ <h1>
       <md-radio-button value="option_3">Radio 3</md-radio-button>
       | Text 4 |
       <md-input-container>
-        <input mdInput placeholder="Input">
+        <input mdInput placeholder="Input" value="Text Input">
+      </md-input-container>
+      | Text 5 |
+      <md-input-container>
+        <textarea mdInput placeholder="Input">Textarea&#10;Line 2</textarea>
       </md-input-container>
       | Text After
     </h1>
diff --git a/src/lib/input/input-container.scss b/src/lib/input/input-container.scss
index 79c5fd579341..9831ff0dbf70 100644
--- a/src/lib/input/input-container.scss
+++ b/src/lib/input/input-container.scss
@@ -83,6 +83,9 @@ $mat-input-underline-disabled-background-image:
   padding: 0;
   width: 100%;
 
+  // Needed to make last line of the textarea line up with the baseline.
+  vertical-align: bottom;
+
   .mat-end & {
     text-align: right;
 

From 7592a1303fc7612cd1b54af007fca664e4be2cce Mon Sep 17 00:00:00 2001
From: Miles Malerba <mmalerba@google.com>
Date: Fri, 24 Mar 2017 14:24:10 -0700
Subject: [PATCH 2/2] add mdTextareaAutosize to baseline demo

---
 src/demo-app/baseline/baseline-demo.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/demo-app/baseline/baseline-demo.html b/src/demo-app/baseline/baseline-demo.html
index 8b11f66c6857..cfcf7e6470ee 100644
--- a/src/demo-app/baseline/baseline-demo.html
+++ b/src/demo-app/baseline/baseline-demo.html
@@ -15,7 +15,7 @@
     </md-input-container>
     | Text 5 |
     <md-input-container>
-      <textarea mdInput placeholder="Input">Textarea&#10;Line 2</textarea>
+      <textarea mdInput placeholder="Input" mdTextareaAutosize>Textarea&#10;Line 2</textarea>
     </md-input-container>
     | Text After
   </md-card-content>
@@ -39,7 +39,7 @@ <h1>
       </md-input-container>
       | Text 5 |
       <md-input-container>
-        <textarea mdInput placeholder="Input">Textarea&#10;Line 2</textarea>
+        <textarea mdInput placeholder="Input" mdTextareaAutosize>Textarea&#10;Line 2</textarea>
       </md-input-container>
       | Text After
     </h1>