rebase and fix lint

Author: mmalerba

src/demo-app/demo-material-module.ts

@@ -51,7 +51,7 @@ import {CdkTableModule} from '@angular/cdk/table';
     MdDatepickerModule,
     MdDialogModule,
     MdExpansionModule,
-    //MdFormFieldModule,
+    MdFormFieldModule,
     MdGridListModule,
     MdIconModule,
     MdInputModule,

src/lib/datepicker/datepicker.spec.ts

@@ -16,7 +16,7 @@ import {
   createKeyboardEvent,
   dispatchEvent,
 } from '@angular/cdk/testing';
-import {MdFormFieldModule} from "../form-field/index";
+import {MdFormFieldModule} from '../form-field/index';
 
 describe('MdDatepicker', () => {
   afterEach(inject([OverlayContainer], (container: OverlayContainer) => {

src/lib/form-field/_form-field-theme.scss

@@ -178,10 +178,11 @@
     border-top: $infix-margin-top solid transparent;
   }
 
-  .mat-form-field-autofill-float:-webkit-autofill +
-      .mat-form-field-placeholder-wrapper .mat-form-field-float {
-    @include _mat-form-field-placeholder-floating(
-        $subscript-font-scale, $infix-padding, $infix-margin-top);
+  .mat-form-field-autofill-float {
+    &:-webkit-autofill + .mat-form-field-placeholder-wrapper .mat-form-field-float {
+      @include _mat-form-field-placeholder-floating(
+          $subscript-font-scale, $infix-padding, $infix-margin-top);
+    }
   }
 
   .mat-form-field-placeholder-wrapper {