From 60fcd6f4d8b895162b37a940c3f33164d8044382 Mon Sep 17 00:00:00 2001
From: Andrew <andrewtjoslin@gmail.com>
Date: Wed, 7 Jan 2015 13:26:49 -0700
Subject: [PATCH] feat(input): add <md-input-container> parent for
 inputs/textareas, deprecate md-text-float

Closes #993. Closes #372. Closes #476. Closes #523. Closes #543. Closes #547.
Closes #553. Closes #562. Closes #575. Closes #605. Closes #606. Closes #612.
Closes #654. Closes #687. Closes #744. Closes #839. Closes #847. Closes #931.
Closes #993.

md-textfloat has been deprecated due to flaws
(explanation in [#547](https://github.com/angular/material/issues/547)).

Now, to create an input you use the native `<input>` and `<textarea>`
elements, with a `<md-input-container>` parent around each
`<input>` or `<textarea>`.

Change your code from this:

```html
<md-textfloat label="First Name" ng-model="firstName"></md-textfloat>
```

To this:

```html
<md-input-container>
  <label>First Name</label>
  <input ng-model="firstName">
</md-input-container>
````
---
 .../input/demoBasicUsage/index.html           |  58 +++++++
 src/components/input/demoBasicUsage/script.js |  16 ++
 src/components/input/input-theme.scss         |  42 +++++
 src/components/input/input.js                 | 154 ++++++++++++++++++
 src/components/input/input.scss               |  88 ++++++++++
 src/components/input/input.spec.js            |  58 +++++++
 .../textField/demoBasicUsage/index.html       |  29 ----
 .../textField/demoBasicUsage/script.js        |  23 ---
 .../textField/demoBasicUsage/style.css        |  55 -------
 src/components/textField/textField-theme.scss |  10 +-
 src/components/textField/textField.js         |  80 ++-------
 src/components/textField/textField.spec.js    |   2 +-
 src/core/services/theming/theming.js          |   2 +-
 src/core/services/theming/theming.spec.js     |   2 +-
 src/core/style/mixins.scss                    |   8 +-
 15 files changed, 439 insertions(+), 188 deletions(-)
 create mode 100644 src/components/input/demoBasicUsage/index.html
 create mode 100644 src/components/input/demoBasicUsage/script.js
 create mode 100644 src/components/input/input-theme.scss
 create mode 100644 src/components/input/input.js
 create mode 100644 src/components/input/input.scss
 create mode 100644 src/components/input/input.spec.js
 delete mode 100644 src/components/textField/demoBasicUsage/index.html
 delete mode 100644 src/components/textField/demoBasicUsage/script.js
 delete mode 100644 src/components/textField/demoBasicUsage/style.css

diff --git a/src/components/input/demoBasicUsage/index.html b/src/components/input/demoBasicUsage/index.html
new file mode 100644
index 00000000000..ecd0bbfe4bb
--- /dev/null
+++ b/src/components/input/demoBasicUsage/index.html
@@ -0,0 +1,58 @@
+<div ng-app="inputBasicDemo" ng-controller="DemoCtrl" layout="column">
+
+  <md-content md-theme="docs-dark" class="md-padding" layout="row" layout-sm="column">
+    <md-input-container>
+      <label>Title</label>
+      <input ng-model="user.title">
+    </md-input-container>
+    <md-input-container>
+      <label>Email</label>
+      <input ng-model="user.email" type="email">
+    </md-input-container>
+  </md-content>
+
+  <md-content class="md-padding">
+
+    <md-input-container flex>
+      <label>Company (Disabled)</label>
+      <input ng-model="user.company" disabled>
+    </md-input-container>
+  
+    <div layout layout-padding layout-sm="column">
+      <md-input-container flex>
+        <label>First Name</label>
+        <input ng-model="user.firstName">
+      </md-input-container>
+      <md-input-container flex>
+        <label>Last Name</label>
+        <input ng-model="user.lastName">
+      </md-input-container>
+    </div>
+
+    <md-input-container flex>
+      <label>Address</label>
+      <input ng-model="user.address">
+    </md-input-container>
+
+    <div layout layout-padding layout-sm="column">
+      <md-input-container flex>
+        <label>City</label>
+        <input ng-model="user.city">
+      </md-input-container>
+      <md-input-container flex>
+        <label>State</label>
+        <input ng-model="user.state">
+      </md-input-container>
+      <md-input-container flex>
+        <label>Postal Code</label>
+        <input ng-model="user.postalCode">
+      </md-input-container>
+    </div>
+
+    <md-input-container flex>
+      <label>Country</label>
+      <input ng-model="user.country">
+    </md-input-container>
+
+  </md-content>
+</div>
diff --git a/src/components/input/demoBasicUsage/script.js b/src/components/input/demoBasicUsage/script.js
new file mode 100644
index 00000000000..5e6ad42bada
--- /dev/null
+++ b/src/components/input/demoBasicUsage/script.js
@@ -0,0 +1,16 @@
+angular.module('inputBasicDemo', ['ngMaterial'])
+
+.controller('DemoCtrl', function($scope) {
+  $scope.user = {
+    title: 'Developer',
+    email: 'ipsum@lorem.com',
+    firstName: '',
+    lastName: '' ,
+    company: 'Google' ,
+    address: '1600 Amphitheatre Pkwy' ,
+    city: 'Mountain View' ,
+    state: 'CA' ,
+    country: 'USA' ,
+    postalCode : '94043'
+  };
+});
diff --git a/src/components/input/input-theme.scss b/src/components/input/input-theme.scss
new file mode 100644
index 00000000000..d63703fe9b8
--- /dev/null
+++ b/src/components/input/input-theme.scss
@@ -0,0 +1,42 @@
+md-input-container.md-THEME_NAME-theme {
+  .md-input {
+    @include input-placeholder-color('{{foreground-3}}');
+    color: '{{foreground-1}}';
+    border-color: '{{foreground-4}}';
+    text-shadow: '{{foreground-shadow}}';
+  }
+
+  label {
+    text-shadow: '{{foreground-shadow}}';
+    color: '{{foreground-3}}';
+  }
+
+  &.md-input-focused {
+    .md-input {
+      border-color: '{{primary-500}}';
+    }
+    label {
+      color: '{{primary-500}}';
+    }
+    &.md-accent {
+      .md-input {
+        border-color: '{{accent-500}}';
+      }
+      label {
+        color: '{{accent-500}}';
+      }
+    }
+  }
+
+  &.md-input-has-value:not(.md-input-focused) {
+    label {
+      color: '{{foreground-2}}';
+    }
+  }
+
+  .md-input[disabled] {
+    border-bottom-color: transparent;
+    color: '{{foreground-3}}';
+    background-image: linear-gradient(to right, '{{foreground-4}}' 0%, '{{foreground-4}}' 33%, transparent 0%);
+  }
+}
diff --git a/src/components/input/input.js b/src/components/input/input.js
new file mode 100644
index 00000000000..8fa703bbcb7
--- /dev/null
+++ b/src/components/input/input.js
@@ -0,0 +1,154 @@
+(function() {
+
+/**
+ * @ngdoc module
+ * @name material.components.input
+ */
+
+angular.module('material.components.input', [
+  'material.core'
+])
+  .directive('mdInputContainer', mdInputContainerDirective)
+  .directive('label', labelDirective)
+  .directive('input', inputDirective)
+  .directive('textarea', inputDirective);
+
+/**
+ * @ngdoc directive
+ * @name mdInputContainer
+ * @module material.components.input
+ *
+ * @restrict E
+ *
+ * @description
+ * `<md-input-container>` is the parent of any input or textarea element.
+ *
+ * Input and textarea elements will not behave properly unless the md-input-container 
+ * parent is provided.
+ *
+ * @usage
+ * <hljs lang="html">
+ *
+ * <md-input-container>
+ *   <label>Username</label>
+ *   <input type="text" ng-model="user.name">
+ * </md-input-container>
+ *
+ * <md-input-container>
+ *   <label>Description</label>
+ *   <textarea ng-model="user.description"></textarea>
+ * </md-input-container>
+ *
+ * </hljs>
+ */
+function mdInputContainerDirective($mdTheming) {
+  return {
+    restrict: 'E',
+    link: postLink,
+    controller: ContainerCtrl
+  };
+
+  function postLink(scope, element, attr) {
+    $mdTheming(element);
+  }
+  function ContainerCtrl($scope, $element, $mdUtil) {
+    var self = this;
+
+    self.setFocused = function(isFocused) {
+      $element.toggleClass('md-input-focused', !!isFocused);
+    };
+    self.setHasValue = function(hasValue) {
+      $element.toggleClass('md-input-has-value', !!hasValue);
+    };
+
+    $scope.$watch(function() {
+      return self.label && self.input;
+    }, function(hasLabelAndInput) {
+      if (hasLabelAndInput && !self.label.attr('for')) {
+        self.label.attr('for', self.input.attr('id'));
+      }
+    });
+  }
+}
+
+function labelDirective() {
+  return {
+    restrict: 'E',
+    require: '^?mdInputContainer',
+    link: function(scope, element, attr, containerCtrl) {
+      if (!containerCtrl) return;
+
+      containerCtrl.label = element;
+      scope.$on('$destroy', function() {
+        containerCtrl.label = null;
+      });
+    }
+  };
+}
+
+function inputDirective($mdUtil) {
+  return {
+    restrict: 'E',
+    require: ['^?mdInputContainer', '?ngModel'],
+    compile: compile,
+  };
+  
+  function compile(element) {
+    element.addClass('md-input');
+    return postLink;
+  }
+  function postLink(scope, element, attr, ctrls) {
+
+    var containerCtrl = ctrls[0];
+    var ngModelCtrl = ctrls[1];
+
+    if ( !containerCtrl ) return;
+
+    if (containerCtrl.input) {
+      throw new Error("<md-input-container> can only have *one* <input> or <textarea> child element!");
+    }
+    if (!element.attr('id')) {
+      element.attr('id', 'input_' + $mdUtil.nextUid());
+    }
+
+    containerCtrl.input = element;
+
+    // When the input value changes, check if it "has" a value, and
+    // set the appropriate class on the input group
+    if (ngModelCtrl) {
+      ngModelCtrl.$formatters.push(checkHasValue);
+      ngModelCtrl.$parsers.push(checkHasValue);
+    } else {
+      element.on('input', function() {
+        containerCtrl.setHasValue( (""+element.val()).length > 0 );
+      });
+      containerCtrl.setHasValue( (""+element.val()).length > 0 );
+    }
+    function checkHasValue(value) {
+      containerCtrl.setHasValue(!ngModelCtrl.$isEmpty(value));
+      return value;
+    }
+
+    element
+      .on('focus', function(e) {
+        containerCtrl.setFocused(true);
+      })
+      .on('blur', function(e) {
+        containerCtrl.setFocused(false);
+      });
+
+    scope.$on('$destroy', function() {
+      containerCtrl.setFocused(false);
+      containerCtrl.setHasValue(false);
+      containerCtrl.input = null;
+    });
+
+    function isNotEmpty(value) {
+      value = angular.isUndefined(value) ? element.val() : value;
+      return (angular.isDefined(value) && (value!==null) &&
+             (value.toString().trim() !== ""));
+    }
+  }
+}
+
+})();
diff --git a/src/components/input/input.scss b/src/components/input/input.scss
new file mode 100644
index 00000000000..788bc2bf4a6
--- /dev/null
+++ b/src/components/input/input.scss
@@ -0,0 +1,88 @@
+$input-container-padding: 2px !default;
+
+$input-label-default-offset: 24px !default;
+$input-label-default-scale: 1.0 !default;
+$input-label-float-offset: 4px !default;
+$input-label-float-scale: 0.75 !default;
+
+$input-border-width-default: 1px !default;
+$input-border-width-focused: 2px !default;
+$input-line-height: 26px !default;
+$input-padding-top: 2px !default;
+
+md-input-container {
+  display: flex;
+  position: relative;
+  flex-direction: column;
+  padding: $input-container-padding;
+
+  textarea,
+  input[type="text"],
+  input[type="password"],
+  input[type="datetime"],
+  input[type="datetime-local"],
+  input[type="date"],
+  input[type="month"],
+  input[type="time"],
+  input[type="week"],
+  input[type="number"],
+  input[type="email"],
+  input[type="url"],
+  input[type="search"],
+  input[type="tel"],
+  input[type="color"] {
+    /* remove default appearance from all input/textarea */
+    -moz-appearance: none;
+    -webkit-appearance: none;
+  }
+
+  label {
+    order: 1;
+    pointer-events: none;
+    -webkit-font-smoothing: antialiased;
+    z-index: 1;
+    transform: translate3d(0, $input-label-default-offset, 0) scale($input-label-default-scale);
+    transform-origin: left top;
+    transition: all $swift-ease-out-timing-function 0.2s;
+  }
+
+  /* 
+   * The .md-input class is added to the input/textarea 
+   */
+  .md-input {
+    flex: 1;
+    order: 2;
+    display: block;
+
+    background: none;
+    padding-top: $input-padding-top;
+    padding-bottom: $input-border-width-focused - $input-border-width-default;
+    border-width: 0 0 $input-border-width-default 0;
+    line-height: $input-line-height;
+
+    &:focus {
+      outline: none;
+    }
+  }
+
+  &.md-input-focused,
+  &.md-input-has-value {
+    label {
+      transform: translate3d(0,$input-label-float-offset,0) scale($input-label-float-scale);
+    }
+  }
+  &.md-input-focused {
+    .md-input {
+      padding-bottom: 0px; // Increase border width by 1px, decrease padding by 1
+      border-width: 0 0 $input-border-width-focused 0;
+    }
+  }
+
+  .md-input[disabled] {
+    background-position: 0 bottom;
+    // This background-size is coordinated with a linear-gradient set in input-theme.scss 
+    // to create a dotted line under the input. 
+    background-size: 3px 1px;
+    background-repeat: repeat-x;
+  }
+}
diff --git a/src/components/input/input.spec.js b/src/components/input/input.spec.js
new file mode 100644
index 00000000000..a9c588be988
--- /dev/null
+++ b/src/components/input/input.spec.js
@@ -0,0 +1,58 @@
+describe('md-input-container directive', function() {
+  beforeEach(module('material.components.input'));
+
+  function setup(attrs) {
+    var container;
+    inject(function($rootScope, $compile) {
+      container = $compile('<md-input-container><input ' +(attrs||'')+ '><label></label></md-input-container>')($rootScope);
+      $rootScope.$apply();
+    });
+    return container;
+  }
+
+  it('should set focus class on container', function() {
+    var el = setup();
+    expect(el).not.toHaveClass('md-input-focused');
+
+    el.find('input').triggerHandler('focus');
+    expect(el).toHaveClass('md-input-focused');
+
+    el.find('input').triggerHandler('blur');
+    expect(el).not.toHaveClass('md-input-focused');
+  });
+
+  it('should set has-value class on container for non-ng-model input', function() {
+    var el = setup();
+    expect(el).not.toHaveClass('md-input-has-value');
+
+    el.find('input').val('123').triggerHandler('input');
+    expect(el).toHaveClass('md-input-has-value');
+
+    el.find('input').val('').triggerHandler('input');
+    expect(el).not.toHaveClass('md-input-has-value');
+  });
+
+  it('should set has-value class on container for ng-model input', inject(function($rootScope) {
+    $rootScope.value = 'test';
+    var el = setup('ng-model="$root.value"');
+    expect(el).toHaveClass('md-input-has-value');
+
+    $rootScope.$apply('value = "3"');
+    expect(el).toHaveClass('md-input-has-value');
+
+    $rootScope.$apply('value = null');
+    expect(el).not.toHaveClass('md-input-has-value');
+  }));
+
+  it('should match label to given input id', inject(function($rootScope) {
+    var el = setup('id="foo"');
+    expect(el.find('label').attr('for')).toBe('foo');
+    expect(el.find('input').attr('id')).toBe('foo');
+  }));
+
+  it('should match label to automatic input id', inject(function($rootScope) {
+    var el = setup();
+    expect(el.find('input').attr('id')).toBeTruthy();
+    expect(el.find('label').attr('for')).toBe(el.find('input').attr('id'));
+  }));
+});
diff --git a/src/components/textField/demoBasicUsage/index.html b/src/components/textField/demoBasicUsage/index.html
deleted file mode 100644
index 65b6833176e..00000000000
--- a/src/components/textField/demoBasicUsage/index.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
-<div ng-controller="DemoController" layout="column">
-  <md-content md-theme="docs-dark">
-    <form style="padding: 20px;">
-      <div class="row">
-        <md-text-float label="Title"  ng-model="user.title"   ></md-text-float>
-        <md-text-float label="eMail"  ng-model="user.email" type="email" ></md-text-float>
-      </div>
-    </form>
-  </md-content>
-
-  <md-content>
-    <form style="padding: 20px;">
-      <md-text-float label="Company"       ng-model="user.company"    disabled > </md-text-float>
-      <div class="row">
-          <md-text-float label="FirstName" ng-model="user.firstName"  > </md-text-float>
-          <md-text-float label="LastName"  ng-model="user.lastName"   class="long"> </md-text-float>
-      </div>
-      <md-text-float label="Address"       ng-model="user.address"    > </md-text-float>
-      <div class="row">
-        <md-text-float label="City"        ng-model="user.city"       > </md-text-float>
-        <md-text-float label="State"       ng-model="user.state"      > </md-text-float>
-        <md-text-float label="Postal Code" ng-model="user.postalCode" > </md-text-float>
-      </div>
-      <md-text-float label="Country"       ng-model="user.country"    disabled > </md-text-float>
-    </form>
-  </md-content>
-
-</div>
diff --git a/src/components/textField/demoBasicUsage/script.js b/src/components/textField/demoBasicUsage/script.js
deleted file mode 100644
index 9faf8685ee8..00000000000
--- a/src/components/textField/demoBasicUsage/script.js
+++ /dev/null
@@ -1,23 +0,0 @@
-
-angular.module('textFieldDemo1', ['ngMaterial'])
-
-  /**
-   *  Simple controller to build a `user` data model
-   *  that will be used to databinding with `<tf-float>` directives
-   */
-  .controller('DemoController', function($scope) {
-    $scope.user = {
-       title:     "Technical Program Manager",
-       email:     "ipsum@lorem.com",
-       firstName: "Naomi",
-       lastName:  "" ,
-       company:   "Google" ,
-       address:   "1600 Amphitheatre Pkwy" ,
-       city:      "Mountain View" ,
-       state:     "CA" ,
-       country:   "USA" ,
-       postalCode : "94043"
-    };
-  });
-
-
diff --git a/src/components/textField/demoBasicUsage/style.css b/src/components/textField/demoBasicUsage/style.css
deleted file mode 100644
index 1c891686c64..00000000000
--- a/src/components/textField/demoBasicUsage/style.css
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- *  SaSS version
- *
- * form > .row {
- *   @include flex-display();
- *   @include flex-align-items(center);
- *   @include flex-direction(row);
- *
- *   > * {
- *     font-size: inherit;
- *     margin: 0 8px;
- *   }
- *
- *   margin-left: -8px;
- * }
- *
- *
- * md-input-group.long {
- *   input {
- *      width : 262px;
- *   }
- * }
- *
-*/
-
-form > .row {
-    display: -webkit-box;
-    display: -webkit-flex;
-    display: -moz-box;
-    display: -moz-flex;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    -webkit-align-items: center;
-    -moz-align-items: center;
-    align-items: center;
-    -webkit-box-direction: normal;
-    -webkit-box-orient: horizontal;
-    -webkit-flex-direction: row;
-    -moz-flex-direction: row;
-    -ms-flex-direction: row;
-    flex-direction: row;
-    margin-left: -8px;
-}
-
-.row > * {
-    font-size: inherit;
-    margin-left: 8px;
-    margin-right: 8px;
-}
-
-md-input-group.long > input {
-    width: 264px;
-}
diff --git a/src/components/textField/textField-theme.scss b/src/components/textField/textField-theme.scss
index e3f21d06464..6b9b2d4e1da 100644
--- a/src/components/textField/textField-theme.scss
+++ b/src/components/textField/textField-theme.scss
@@ -1,7 +1,7 @@
 md-input-group.md-THEME_NAME-theme {
   input, textarea {
     text-shadow: '{{foreground-shadow}}';
-    @include input-placeholder('{{foreground-3}}');
+    @include input-placeholder-color('{{foreground-3}}');
   }
 
   label {
@@ -37,10 +37,8 @@ md-input-group.md-THEME_NAME-theme {
     }
   }
 
-  &[disabled] {
-    input, textarea {
-      border-bottom-color: '{{foreground-4}}';
-      color: '{{foreground-3}}';
-    }
+  .md-input[disabled] {
+    border-bottom-color: '{{foreground-4}}';
+    color: '{{foreground-3}}';
   }
 }
diff --git a/src/components/textField/textField.js b/src/components/textField/textField.js
index 134164fef6c..719d32c8d76 100644
--- a/src/components/textField/textField.js
+++ b/src/components/textField/textField.js
@@ -15,34 +15,7 @@ angular.module('material.components.textField', [
   .directive('mdTextFloat', mdTextFloatDirective);
 
 
-
-/**
- * @ngdoc directive
- * @name mdTextFloat
- * @module material.components.textField
- *
- * @restrict E
- *
- * @description
- * Use the `<md-text-float>` directive to quickly construct `Floating Label` text fields
- *
- * @param {string} ng-model Model expression used for two-way data binding with the input value.
- * @param {string} label String value or expression that specifies the input text field label/hint.
- * @param {string=} type Optional value to define the type of input field. Defaults to string.
- * @param {string=} md-fid Optional attribute used for accessibility link pairing between the Label and Input elements
- *
- * @usage
- * <hljs lang="html">
- * <md-text-float label="LastName" ng-model="user.lastName" > </md-text-float>
- *
- * <!-- Specify a read-only input field by using the `disabled` attribute -->
- * <md-text-float label="Company"  ng-model="user.company" ng-disabled="true" > </md-text-float>
- *
- * <!-- Specify an input type if desired. -->
- * <md-text-float label="eMail"    ng-model="user.email" type="email" ></md-text-float>
- * </hljs>
- */
-function mdTextFloatDirective($mdTheming, $mdUtil, $parse) {
+function mdTextFloatDirective($mdTheming, $mdUtil, $parse, $log) {
   return {
     restrict: 'E',
     replace: true,
@@ -53,6 +26,9 @@ function mdTextFloatDirective($mdTheming, $mdUtil, $parse) {
     },
     compile : function(element, attr) {
 
+      $log.warn('<md-text-float> is deprecated. Please use `<md-input-container>` and `<input>`.' + 
+                'More information at http://material.angularjs.org/#/api/material.components.input/directive/mdInputContainer');
+
       if ( angular.isUndefined(attr.mdFid) ) {
         attr.mdFid = $mdUtil.nextUid();
       }
@@ -77,28 +53,13 @@ function mdTextFloatDirective($mdTheming, $mdUtil, $parse) {
   };
 }
 
-/*
- * @private
- *
- * @ngdoc directive
- * @name mdInputGroup
- * @module material.components.textField
- * @restrict E
- * @description
- * Use the `<md-input-group>` directive as the grouping parent of a `<md-input>` element.
- *
- * @usage 
- * <hljs lang="html">
- * <md-input-group ng-disabled="isDisabled">
- *   <label for="{{fid}}">{{someLabel}}</label>
- *   <md-input id="{{fid}}" type="text" ng-model="someText"></md-input>
- * </md-input-group>
- * </hljs>
- */
-function mdInputGroupDirective() {
+function mdInputGroupDirective($log) {
   return {
     restrict: 'CE',
     controller: ['$element', function($element) {
+
+      $log.warn('<md-input-group> is deprecated. Please use `<md-input-container>` and `<input>`.' + 
+                'More information at http://material.angularjs.org/#/api/material.components.input/directive/mdInputContainer');
       this.setFocused = function(isFocused) {
         $element.toggleClass('md-input-focused', !!isFocused);
       };
@@ -110,27 +71,7 @@ function mdInputGroupDirective() {
 
 }
 
-/*
- * @private
- *
- * @ngdoc directive
- * @name mdInput
- * @module material.components.textField
- *
- * @restrict E
- *
- * @description
- * Use the `<md-input>` directive as elements within a `<md-input-group>` container
- *
- * @usage
- * <hljs lang="html">
- * <md-input-group ng-disabled="user.isLocked">
- *   <label for="i1">FirstName</label>
- *   <md-input id="i1" ng-model="user.firstName"></md-input>
- * </md-input-group>
- * </hljs>
- */
-function mdInputDirective($mdUtil) {
+function mdInputDirective($mdUtil, $log) {
   return {
     restrict: 'E',
     replace: true,
@@ -139,6 +80,9 @@ function mdInputDirective($mdUtil) {
     link: function(scope, element, attr, ctrls) {
       if ( !ctrls[0] ) return;
 
+      $log.warn('<md-input> is deprecated. Please use `<md-input-container>` and `<input>`.' + 
+                'More information at http://material.angularjs.org/#/api/material.components.input/directive/mdInputContainer');
+
       var inputGroupCtrl = ctrls[0];
       var ngModelCtrl = ctrls[1];
 
diff --git a/src/components/textField/textField.spec.js b/src/components/textField/textField.spec.js
index 5325aa4029d..6a98b526e34 100644
--- a/src/components/textField/textField.spec.js
+++ b/src/components/textField/textField.spec.js
@@ -74,7 +74,7 @@ describe('Text Field directives', function() {
           email: 'AndrewJoslin@drifty.com',
           password: 'public'
         }
-      }
+      };
     });
 
     it('should set input type `password` properly', function() {
diff --git a/src/core/services/theming/theming.js b/src/core/services/theming/theming.js
index 87c2b6e2180..ed971ef271e 100644
--- a/src/core/services/theming/theming.js
+++ b/src/core/services/theming/theming.js
@@ -49,7 +49,7 @@ var LIGHT_FOREGROUND = {
   '4': 'rgba(255,255,255,0.12)'
 };
 
-var DARK_SHADOW = '1px 1px 0px rgba(black, 0.4), -1px -1px 0px rgba(black, 0.4)';
+var DARK_SHADOW = '1px 1px 0px rgba(0,0,0,0.4), -1px -1px 0px rgba(0,0,0,0.4)';
 var LIGHT_SHADOW = '';
 
 var DARK_CONTRAST_COLOR = colorToRgbaArray('rgba(0,0,0,0.87)');
diff --git a/src/core/services/theming/theming.spec.js b/src/core/services/theming/theming.spec.js
index 4028cb517d2..40b3c0605c2 100644
--- a/src/core/services/theming/theming.spec.js
+++ b/src/core/services/theming/theming.spec.js
@@ -200,7 +200,7 @@ describe('$mdThemingProvider', function() {
         expect(parse('.md-THEME_NAME-theme { color: "{{foreground-4}}"; }')[0].content)
           .toEqual('color: rgba(255,255,255,0.12);');
         expect(parse('.md-THEME_NAME-theme { color: "{{foreground-shadow}}"; }')[0].content)
-          .toEqual('color: 1px 1px 0px rgba(black, 0.4), -1px -1px 0px rgba(black, 0.4);');
+          .toEqual('color: 1px 1px 0px rgba(0,0,0,0.4), -1px -1px 0px rgba(0,0,0,0.4);');
       });
     });
     it('parses contrast colors', function() {
diff --git a/src/core/style/mixins.scss b/src/core/style/mixins.scss
index 78000eca789..e01ec99cb3d 100644
--- a/src/core/style/mixins.scss
+++ b/src/core/style/mixins.scss
@@ -9,11 +9,11 @@
   user-select: $value;
 }
 
-@mixin input-placeholder($color) {
+@mixin input-placeholder-color($color) {
+  &::-webkit-input-placeholder,
+  &::-moz-placeholder, /* Firefox 19+ */
+  &:-moz-placeholder, /* Firefox 18- */
   &:-ms-input-placeholder {
     color: $color;
   }
-  &::-webkit-input-placeholder {
-    color: $color;
-  }
 }