Skip to content
This repository was archived by the owner on Dec 18, 2024. It is now read-only.

Commit fd086cb

Browse files
amcdnljelbourn
authored andcommitted
Migrate from md to mat & updates angular 4.4.3 (#276)
1 parent 88c2dee commit fd086cb

32 files changed

+121
-119
lines changed

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,25 @@
1818
},
1919
"private": true,
2020
"dependencies": {
21-
"@angular/animations": "^4.3.0",
21+
"@angular/animations": "^4.4.3",
2222
"@angular/cdk": "2.0.0-beta.11",
23-
"@angular/common": "^4.3.0",
24-
"@angular/compiler": "^4.3.0",
25-
"@angular/core": "^4.3.0",
26-
"@angular/forms": "^4.3.0",
27-
"@angular/http": "^4.3.0",
23+
"@angular/common": "^4.4.3",
24+
"@angular/compiler": "^4.4.3",
25+
"@angular/core": "^4.4.3",
26+
"@angular/forms": "^4.4.3",
27+
"@angular/http": "^4.4.3",
2828
"@angular/material": "2.0.0-beta.11",
29-
"@angular/platform-browser": "^4.3.0",
30-
"@angular/platform-browser-dynamic": "^4.3.0",
31-
"@angular/router": "^4.3.0",
29+
"@angular/platform-browser": "^4.4.3",
30+
"@angular/platform-browser-dynamic": "^4.4.3",
31+
"@angular/router": "^4.4.3",
3232
"@angular/service-worker": "^1.0.0-beta.16",
3333
"core-js": "^2.4.1",
3434
"rxjs": "^5.1.0",
3535
"zone.js": "^0.8.4"
3636
},
3737
"devDependencies": {
3838
"@angular/cli": "^1.0.0",
39-
"@angular/compiler-cli": "^4.3.0",
39+
"@angular/compiler-cli": "^4.4.3",
4040
"@types/jasmine": "^2.5.41",
4141
"@types/node": "^7.0.5",
4242
"hammerjs": "^2.0.8",

src/app/app-module.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {LocationStrategy, PathLocationStrategy} from '@angular/common';
55
import {FormsModule} from '@angular/forms';
66
import {HttpModule} from '@angular/http';
77
import {RouterModule} from '@angular/router';
8-
import {MdNativeDateModule} from '@angular/material';
8+
import {MatNativeDateModule, MATERIAL_COMPATIBILITY_MODE} from '@angular/material';
99
import {ExampleModule} from '@angular/material-examples';
1010

1111
import {MaterialDocsApp} from './material-docs-app';
@@ -37,7 +37,7 @@ import {DocViewerModule} from './shared/doc-viewer/doc-viewer-module';
3737
ExampleModule,
3838
FormsModule,
3939
HttpModule,
40-
MdNativeDateModule,
40+
MatNativeDateModule,
4141
RouterModule.forRoot(MATERIAL_DOCS_ROUTES),
4242

4343
ComponentCategoryListModule,
@@ -63,6 +63,7 @@ import {DocViewerModule} from './shared/doc-viewer/doc-viewer-module';
6363
StyleManager,
6464
ThemeStorage,
6565
{provide: LocationStrategy, useClass: PathLocationStrategy},
66+
{provide: MATERIAL_COMPATIBILITY_MODE, useValue: true},
6667
],
6768
bootstrap: [MaterialDocsApp],
6869
})

src/app/pages/component-category-list/component-category-list.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<a *ngFor="let category of docItems.getItemsInCategories()"
33
class="docs-component-category-list-item"
44
[routerLink]="['/categories/', category.id]">
5-
<md-card class="docs-component-category-list-card">
6-
<md-card-title>{{category.name}}</md-card-title>
7-
</md-card>
5+
<mat-card class="docs-component-category-list-card">
6+
<mat-card-title>{{category.name}}</mat-card-title>
7+
</mat-card>
88
</a>
99
</div>

src/app/pages/component-category-list/component-category-list.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, NgModule} from '@angular/core';
2-
import {MdCardModule} from '@angular/material';
2+
import {MatCardModule} from '@angular/material';
33
import {CommonModule} from '@angular/common';
44
import {RouterModule} from '@angular/router';
55
import {DocumentationItems} from '../../shared/documentation-items/documentation-items';
@@ -22,7 +22,7 @@ export class ComponentCategoryList {
2222
}
2323

2424
@NgModule({
25-
imports: [SvgViewerModule, MdCardModule, CommonModule, RouterModule],
25+
imports: [SvgViewerModule, MatCardModule, CommonModule, RouterModule],
2626
exports: [ComponentCategoryList],
2727
declarations: [ComponentCategoryList],
2828
providers: [DocumentationItems, ComponentPageTitle],

src/app/pages/component-list/component-list.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
<a *ngFor="let component of category.items"
33
class="docs-component-list-item"
44
[routerLink]="['/components/', component.id]">
5-
<md-card class="docs-component-list-card">
6-
<md-card-title class="docs-component-list-card-title">{{component.name}}</md-card-title>
5+
<mat-card class="docs-component-list-card">
6+
<mat-card-title class="docs-component-list-card-title">{{component.name}}</mat-card-title>
77
<div class="docs-component-list-icon-spacer"></div>
88
<div class="docs-component-list-item-icon">
99
<docs-svg-viewer
1010
[attr.aria-label]="component.name"
1111
scaleToContainer="true"
1212
[src]="'../../../assets/img/components/' + component.id + '.svg'"></docs-svg-viewer>
1313
</div>
14-
</md-card>
14+
</mat-card>
1515
</a>
1616
</div>
1717

src/app/pages/component-list/component-list.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {ActivatedRoute, Router, RouterModule} from '@angular/router';
77
import {ComponentPageTitle} from '../page-title/page-title';
88
import {SvgViewerModule} from '../../shared/svg-viewer/svg-viewer';
99
import {CommonModule} from '@angular/common';
10-
import {MdCardModule} from '@angular/material';
10+
import {MatCardModule} from '@angular/material';
1111

1212
@Component({
1313
selector: 'app-components',
@@ -34,7 +34,7 @@ export class ComponentList {
3434
}
3535

3636
@NgModule({
37-
imports: [SvgViewerModule, RouterModule, CommonModule, MdCardModule],
37+
imports: [SvgViewerModule, RouterModule, CommonModule, MatCardModule],
3838
exports: [ComponentList],
3939
declarations: [ComponentList],
4040
providers: [DocumentationItems, ComponentPageTitle],

src/app/pages/component-page-header/component-page-header.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="docs-primary-header component-page-header">
2-
<button md-button class="sidenav-toggle" (click)="toggleSidenav.emit()">
3-
<md-icon>menu</md-icon>
2+
<button mat-button class="sidenav-toggle" (click)="toggleSidenav.emit()">
3+
<mat-icon>menu</mat-icon>
44
</button>
55

66
<h1 focusOnNavigation>{{getTitle()}} </h1>

src/app/pages/component-page-header/component-page-header.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ h1 {
2929
justify-content: center;
3030
}
3131

32-
md-icon {
32+
mat-icon {
3333
font-size: 30px;
3434
height: 64px;
3535
width: 64px;

src/app/pages/component-page-header/component-page-header.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Component, EventEmitter, NgModule, Output} from '@angular/core';
22
import 'rxjs/add/operator/first';
33
import {ComponentPageTitle} from '../page-title/page-title';
44
import {NavigationFocusModule} from '../../shared/navigation-focus/navigation-focus';
5-
import {MdButtonModule, MdIconModule} from '@angular/material';
5+
import {MatButtonModule, MatIconModule} from '@angular/material';
66

77
@Component({
88
selector: 'component-page-header',
@@ -20,7 +20,7 @@ export class ComponentPageHeader {
2020
}
2121

2222
@NgModule({
23-
imports: [MdButtonModule, MdIconModule, NavigationFocusModule],
23+
imports: [MatButtonModule, MatIconModule, NavigationFocusModule],
2424
exports: [ComponentPageHeader],
2525
declarations: [ComponentPageHeader],
2626
providers: [ComponentPageTitle],

src/app/pages/component-sidenav/component-sidenav.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<md-sidenav-container class="docs-component-viewer-sidenav-container">
2-
<md-sidenav #sidenav class="docs-component-viewer-sidenav"
1+
<mat-sidenav-container class="docs-component-viewer-sidenav-container">
2+
<mat-sidenav #sidenav class="docs-component-viewer-sidenav"
33
[opened]="!isScreenSmall()"
44
[mode]="isScreenSmall() ? 'over' : 'side'">
55
<nav *ngFor="let category of docItems.getItemsInCategories()">
@@ -13,11 +13,11 @@ <h3>{{category.name}}</h3>
1313
</li>
1414
</ul>
1515
</nav>
16-
</md-sidenav>
16+
</mat-sidenav>
1717

1818
<div class="docs-component-sidenav-content">
1919
<component-page-header (toggleSidenav)="sidenav.toggle()"></component-page-header>
2020
<router-outlet></router-outlet>
2121
<app-footer></app-footer>
2222
</div>
23-
</md-sidenav-container>
23+
</mat-sidenav-container>

0 commit comments

Comments
 (0)