Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into snack-bar
Browse files Browse the repository at this point in the history
  • Loading branch information
josephperrott committed Oct 14, 2016
2 parents d710b48 + 580da74 commit a654207
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 18 deletions.
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
14 changes: 7 additions & 7 deletions src/lib/core/animation/animation.ts
Original file line number Diff line number Diff line change
@@ -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';
};
3 changes: 2 additions & 1 deletion src/lib/snack-bar/snack-bar-container.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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%);
}
}
4 changes: 2 additions & 2 deletions src/lib/snack-bar/snack-bar-container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}`)),
])
],
})
Expand Down
2 changes: 1 addition & 1 deletion src/lib/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
"skipTemplateCodegen": true,
"debug": true
}
}
}

0 comments on commit a654207

Please sign in to comment.