From f08d8ed0c25ce5c1febb51625544df282c97d36b Mon Sep 17 00:00:00 2001
From: Miles Malerba <mmalerba@google.com>
Date: Tue, 29 Nov 2016 16:44:24 -0800
Subject: [PATCH] fixed some small bugs and converted more of demo

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

diff --git a/src/demo-app/input/input-wrapper-demo.html b/src/demo-app/input/input-wrapper-demo.html
index 669c07d12c91..028eeca5fda3 100644
--- a/src/demo-app/input/input-wrapper-demo.html
+++ b/src/demo-app/input/input-wrapper-demo.html
@@ -7,8 +7,16 @@
       </md-input-wrapper>
 
       <table style="width: 100%" cellspacing="0"><tr>
-        <td><md-input placeholder="First name" style="width: 100%"></md-input></td>
-        <td><md-input placeholder="Long Last Name That Will Be Truncated" style="width: 100%"></md-input></td>
+        <td>
+          <md-input-wrapper style="width: 100%">
+            <input placeholder="First name">
+          </md-input-wrapper>
+        </td>
+        <td>
+          <md-input-wrapper style="width: 100%">
+            <input placeholder="Long Last Name That Will Be Truncated">
+          </md-input-wrapper>
+        </td>
       </tr></table>
       <p>
         <md-textarea class="demo-full-width" placeholder="Address" value="1600 Amphitheatre Pkway"></md-textarea>
diff --git a/src/lib/input/input-wrapper.html b/src/lib/input/input-wrapper.html
index 13e61d9abb7b..7a539766a260 100644
--- a/src/lib/input/input-wrapper.html
+++ b/src/lib/input/input-wrapper.html
@@ -23,7 +23,7 @@
   </div>
 
   <div class="md-input-underline"
-       [class.md-disabled]="_disabled">
+       [class.md-disabled]="_inputDisabled">
     <span class="md-input-ripple"
           [class.md-focused]="_focused"
           [class.md-accent]="dividerColor == 'accent'"
diff --git a/src/lib/input/input-wrapper.scss b/src/lib/input/input-wrapper.scss
index debfa6d7957c..e6c5cd72fde5 100644
--- a/src/lib/input/input-wrapper.scss
+++ b/src/lib/input/input-wrapper.scss
@@ -15,7 +15,7 @@ md-input-wrapper {
 }
 
 .md-input-element {
-  ::placeholder {
+  &::placeholder {
     visibility: hidden;
   }