Merge remote-tracking branch 'upstream/master' into snack-bar

Author: josephperrott

README.md

@@ -28,13 +28,14 @@ and which pieces are blocked) and make a comment.
 Also see our [`Good for community contribution`](https://github.com/angular/material2/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+for+community+contribution%22) 
 label.
 
-High level items planned for September 2016:
-* Work on Angular core towards 2.0.0 final
-* Preparing for conferences (Angular Connect and ng-europe)
-* Final features for dialog
-* Initial version of snackbar.
-* Additional behaviors for menu, start design for select.
-* Finalize high-level design details for data-table.
+High level items planned for October 2016:
+* Initial version of md-select
+* Basic docs for dialog and snackbar
+* Major bug bashing
+* Start design on autocomplete and chips
+* AoT compile e2e app
+* Start work on https://material.angular.io site
+* Onboarding for 3 (!) new Angular Material team members.
 
 
 #### Feature status:

src/lib/core/animation/animation.ts

@@ -1,13 +1,13 @@
 export class AnimationCurves {
-  static get standardCurve(): string { return 'cubic-bezier(0.4,0.0,0.2,1)'; }
-  static get decelerationCurve(): string { return 'cubic-bezier(0.0,0.0,0.2,1)'; }
-  static get accelerationCurve(): string { return 'cubic-bezier(0.4,0.0,1,1)'; }
-  static get sharpCurve(): string { return 'cubic-bezier(0.4,0.0,0.6,1)'; }
+  static STANDARD_CURVE = 'cubic-bezier(0.4,0.0,0.2,1)';
+  static DECELERATION_CURVE = 'cubic-bezier(0.0,0.0,0.2,1)';
+  static ACCELERATION_CURVE = 'cubic-bezier(0.4,0.0,1,1)';
+  static SHARP_CURVE = 'cubic-bezier(0.4,0.0,0.6,1)';
 };
 
 
 export class AnimationDurations {
-   static get complex(): string { return '375ms'; }
-   static get entering(): string { return '225ms'; }
-   static get exiting(): string { return '195ms'; }
+   static COMPLEX = '375ms';
+   static ENTERING = '225ms';
+   static EXITING = '195ms';
  };

src/lib/snack-bar/snack-bar-container.scss

@@ -10,6 +10,7 @@ $md-snack-bar-max-width: 568px !default;
   @include md-elevation(24);
   background: #323232;
   border-radius: 2px;
+  box-sizing: content-box;
   display: block;
   height: $md-snack-bar-height;
   max-width: $md-snack-bar-max-width;
@@ -18,4 +19,4 @@ $md-snack-bar-max-width: 568px !default;
   padding: $md-snack-bar-padding;
   // Initial transformation is applied to start snack bar out of view.
   transform: translateY(100%);
-}
+}

src/lib/snack-bar/snack-bar-container.ts

@@ -46,9 +46,9 @@ export type SnackBarState = 'initial' | 'visible' | 'complete' | 'void';
       state('visible', style({transform: 'translateY(0%)'})),
       state('complete', style({transform: 'translateY(100%)'})),
       transition('visible => complete',
-                 animate(`${AnimationDurations.exiting} ${AnimationCurves.decelerationCurve}`)),
+                 animate(`${AnimationDurations.EXITING} ${AnimationCurves.DECELERATION_CURVE}`)),
       transition('initial => visible, void => visible',
-                 animate(`${AnimationDurations.entering} ${AnimationCurves.accelerationCurve}`)),
+                 animate(`${AnimationDurations.ENTERING} ${AnimationCurves.ACCELERATION_CURVE}`)),
     ])
   ],
 })

src/lib/snack-bar/snack-bar.spec.ts

@@ -102,7 +102,6 @@ describe('MdSnackBar', () => {
     expect(messageElement.tagName).toBe('SPAN', 'Expected snack bar message element to be <span>');
     expect(messageElement.textContent)
         .toBe(simpleMessage, `Expected the snack bar message to be '${simpleMessage}''`);
-
     expect(overlayContainerElement.querySelector('button.md-simple-snackbar-action'))
         .toBeNull('Expected the query selection for action label to be null');
   });

src/lib/tsconfig.json

@@ -30,4 +30,4 @@
     "skipTemplateCodegen": true,
     "debug": true
   }
-}
+}