From 4a052cd343171677c08c4321056a2932f6295aff Mon Sep 17 00:00:00 2001
From: Igor Minar <iminar@google.com>
Date: Wed, 12 Apr 2017 12:25:11 -0700
Subject: [PATCH] build(aio): upgrade to @angular/material#2.0.0-beta.3
 (#15606)

---
 aio/package.json                                 | 2 +-
 aio/src/app/app.component.ts                     | 2 +-
 aio/src/app/app.module.ts                        | 8 +-------
 aio/src/app/embedded/code/code-tabs.component.ts | 4 ++--
 aio/src/styles/main.scss                         | 4 ++--
 aio/src/styles/ng-io-theme.scss                  | 2 +-
 aio/yarn.lock                                    | 6 +++---
 7 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/aio/package.json b/aio/package.json
index 597221cad5..0b2368da6c 100644
--- a/aio/package.json
+++ b/aio/package.json
@@ -35,7 +35,7 @@
     "@angular/core": "next",
     "@angular/forms": "next",
     "@angular/http": "next",
-    "@angular/material": "https://github.com/angular/material2-builds",
+    "@angular/material": "^2.0.0-beta.3",
     "@angular/platform-browser": "next",
     "@angular/platform-browser-dynamic": "next",
     "@angular/platform-server": "next",
diff --git a/aio/src/app/app.component.ts b/aio/src/app/app.component.ts
index de06a196c7..a0a7d0ac75 100644
--- a/aio/src/app/app.component.ts
+++ b/aio/src/app/app.component.ts
@@ -1,6 +1,6 @@
 import { Component, ElementRef, HostListener, OnInit,
          QueryList, ViewChild, ViewChildren } from '@angular/core';
-import { MdSidenav } from '@angular/material/sidenav';
+import { MdSidenav } from '@angular/material';
 
 import { AutoScrollService } from 'app/shared/auto-scroll.service';
 import { CurrentNode, NavigationService, NavigationViews, NavigationNode, VersionInfo } from 'app/navigation/navigation.service';
diff --git a/aio/src/app/app.module.ts b/aio/src/app/app.module.ts
index a0324dbedd..2e57d85970 100644
--- a/aio/src/app/app.module.ts
+++ b/aio/src/app/app.module.ts
@@ -5,13 +5,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 import { Location, LocationStrategy, PathLocationStrategy } from '@angular/common';
 
-import { MdToolbarModule } from '@angular/material/toolbar';
-import { MdButtonModule} from '@angular/material/button';
-import { MdIconModule} from '@angular/material/icon';
-import { MdInputModule } from '@angular/material/input';
-import { MdSidenavModule } from '@angular/material/sidenav';
-import { MdTabsModule } from '@angular/material';
-import { Platform } from '@angular/material/core';
+import { MdToolbarModule, MdButtonModule, MdIconModule, MdInputModule, MdSidenavModule, MdTabsModule, Platform} from '@angular/material';
 
 // Temporary fix for MdSidenavModule issue:
 // crashes with "missing first" operator when SideNav.mode is "over"
diff --git a/aio/src/app/embedded/code/code-tabs.component.ts b/aio/src/app/embedded/code/code-tabs.component.ts
index e0e4a51499..a9300ea0be 100644
--- a/aio/src/app/embedded/code/code-tabs.component.ts
+++ b/aio/src/app/embedded/code/code-tabs.component.ts
@@ -19,9 +19,9 @@ export interface TabInfo {
   template: `
     <md-tab-group class="code-tab-group">
       <md-tab style="overflow-y: hidden;" *ngFor="let tab of tabs">
-        <template md-tab-label>
+        <ng-template md-tab-label>
           <span class="{{tab.class}}">{{ tab.title }}</span>
-        </template>
+        </ng-template>
         <aio-code [code]="tab.code" [language]="tab.language" [linenums]="tab.linenums" class="{{ tab.class }}"></aio-code>
       </md-tab>
     </md-tab-group>
diff --git a/aio/src/styles/main.scss b/aio/src/styles/main.scss
index f46c13e81d..c6e61a0005 100755
--- a/aio/src/styles/main.scss
+++ b/aio/src/styles/main.scss
@@ -1,8 +1,8 @@
 // import global themes
-@import '~@angular/material/core/theming/all-theme';
+@import '~@angular/material/theming';
 @import './ng-io-theme';
 
-// import global variables / 
+// import global variables /
 @import './constants';
 
 // import global mixins
diff --git a/aio/src/styles/ng-io-theme.scss b/aio/src/styles/ng-io-theme.scss
index d036d70924..26ebce0455 100644
--- a/aio/src/styles/ng-io-theme.scss
+++ b/aio/src/styles/ng-io-theme.scss
@@ -1,4 +1,4 @@
-@import '~@angular/material/core/theming/all-theme';
+@import '~@angular/material/theming';
 // Plus imports for other components in your app.
 
 // Include the base styles for Angular Material core. We include this here so that you only
diff --git a/aio/yarn.lock b/aio/yarn.lock
index fb0e4c34e1..647b86a591 100644
--- a/aio/yarn.lock
+++ b/aio/yarn.lock
@@ -98,9 +98,9 @@
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@angular/http/-/http-4.0.0.tgz#45a538eac42a0b13f3744c7e8bafeb17d58da31c"
 
-"@angular/material@https://github.com/angular/material2-builds":
-  version "2.0.0-beta.2"
-  resolved "https://github.com/angular/material2-builds#d7f549850cfd94b31bb624e2702b61305fd6337d"
+"@angular/material@^2.0.0-beta.3":
+  version "2.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-2.0.0-beta.3.tgz#ec31dee61d7300ece28fee476852db236ded1e13"
 
 "@angular/platform-browser-dynamic@next":
   version "4.0.0"