Skip to content

Commit fbb2d4f

Browse files
committed
Merge remote-tracking branch 'upstream/master' into snack-bar
2 parents d710b48 + 580da74 commit fbb2d4f

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@ and which pieces are blocked) and make a comment.
2828
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)
2929
label.
3030

31-
High level items planned for September 2016:
32-
* Work on Angular core towards 2.0.0 final
33-
* Preparing for conferences (Angular Connect and ng-europe)
34-
* Final features for dialog
35-
* Initial version of snackbar.
36-
* Additional behaviors for menu, start design for select.
37-
* Finalize high-level design details for data-table.
31+
High level items planned for October 2016:
32+
* Initial version of md-select
33+
* Basic docs for dialog and snackbar
34+
* Major bug bashing
35+
* Start design on autocomplete and chips
36+
* AoT compile e2e app
37+
* Start work on https://material.angular.io site
38+
* Onboarding for 3 (!) new Angular Material team members.
3839

3940

4041
#### Feature status:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ $md-snack-bar-max-width: 568px !default;
1010
@include md-elevation(24);
1111
background: #323232;
1212
border-radius: 2px;
13+
box-sizing: content-box;
1314
display: block;
1415
height: $md-snack-bar-height;
1516
max-width: $md-snack-bar-max-width;
@@ -18,4 +19,4 @@ $md-snack-bar-max-width: 568px !default;
1819
padding: $md-snack-bar-padding;
1920
// Initial transformation is applied to start snack bar out of view.
2021
transform: translateY(100%);
21-
}
22+
}

src/lib/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030
"skipTemplateCodegen": true,
3131
"debug": true
3232
}
33-
}
33+
}

0 commit comments

Comments
 (0)