diff --git a/package.json b/package.json index 1b20fb6d3..03144e656 100644 --- a/package.json +++ b/package.json @@ -18,17 +18,17 @@ }, "private": true, "dependencies": { - "@angular/animations": "^4.3.0", + "@angular/animations": "^4.4.3", "@angular/cdk": "2.0.0-beta.11", - "@angular/common": "^4.3.0", - "@angular/compiler": "^4.3.0", - "@angular/core": "^4.3.0", - "@angular/forms": "^4.3.0", - "@angular/http": "^4.3.0", + "@angular/common": "^4.4.3", + "@angular/compiler": "^4.4.3", + "@angular/core": "^4.4.3", + "@angular/forms": "^4.4.3", + "@angular/http": "^4.4.3", "@angular/material": "2.0.0-beta.11", - "@angular/platform-browser": "^4.3.0", - "@angular/platform-browser-dynamic": "^4.3.0", - "@angular/router": "^4.3.0", + "@angular/platform-browser": "^4.4.3", + "@angular/platform-browser-dynamic": "^4.4.3", + "@angular/router": "^4.4.3", "@angular/service-worker": "^1.0.0-beta.16", "core-js": "^2.4.1", "rxjs": "^5.1.0", @@ -36,7 +36,7 @@ }, "devDependencies": { "@angular/cli": "^1.0.0", - "@angular/compiler-cli": "^4.3.0", + "@angular/compiler-cli": "^4.4.3", "@types/jasmine": "^2.5.41", "@types/node": "^7.0.5", "hammerjs": "^2.0.8", diff --git a/src/app/app-module.ts b/src/app/app-module.ts index 69a27a6e7..00049370c 100644 --- a/src/app/app-module.ts +++ b/src/app/app-module.ts @@ -5,7 +5,7 @@ import {LocationStrategy, PathLocationStrategy} from '@angular/common'; import {FormsModule} from '@angular/forms'; import {HttpModule} from '@angular/http'; import {RouterModule} from '@angular/router'; -import {MdNativeDateModule} from '@angular/material'; +import {MatNativeDateModule, MATERIAL_COMPATIBILITY_MODE} from '@angular/material'; import {ExampleModule} from '@angular/material-examples'; import {MaterialDocsApp} from './material-docs-app'; @@ -37,7 +37,7 @@ import {DocViewerModule} from './shared/doc-viewer/doc-viewer-module'; ExampleModule, FormsModule, HttpModule, - MdNativeDateModule, + MatNativeDateModule, RouterModule.forRoot(MATERIAL_DOCS_ROUTES), ComponentCategoryListModule, @@ -63,6 +63,7 @@ import {DocViewerModule} from './shared/doc-viewer/doc-viewer-module'; StyleManager, ThemeStorage, {provide: LocationStrategy, useClass: PathLocationStrategy}, + {provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}, ], bootstrap: [MaterialDocsApp], }) diff --git a/src/app/pages/component-category-list/component-category-list.html b/src/app/pages/component-category-list/component-category-list.html index fabf39eed..3e4b0a2df 100644 --- a/src/app/pages/component-category-list/component-category-list.html +++ b/src/app/pages/component-category-list/component-category-list.html @@ -2,8 +2,8 @@ - - {{category.name}} - + + {{category.name}} + diff --git a/src/app/pages/component-category-list/component-category-list.ts b/src/app/pages/component-category-list/component-category-list.ts index 2ff932ef0..c616f0827 100644 --- a/src/app/pages/component-category-list/component-category-list.ts +++ b/src/app/pages/component-category-list/component-category-list.ts @@ -1,5 +1,5 @@ import {Component, NgModule} from '@angular/core'; -import {MdCardModule} from '@angular/material'; +import {MatCardModule} from '@angular/material'; import {CommonModule} from '@angular/common'; import {RouterModule} from '@angular/router'; import {DocumentationItems} from '../../shared/documentation-items/documentation-items'; @@ -22,7 +22,7 @@ export class ComponentCategoryList { } @NgModule({ - imports: [SvgViewerModule, MdCardModule, CommonModule, RouterModule], + imports: [SvgViewerModule, MatCardModule, CommonModule, RouterModule], exports: [ComponentCategoryList], declarations: [ComponentCategoryList], providers: [DocumentationItems, ComponentPageTitle], diff --git a/src/app/pages/component-list/component-list.html b/src/app/pages/component-list/component-list.html index 1e3cab473..9f7944c5e 100644 --- a/src/app/pages/component-list/component-list.html +++ b/src/app/pages/component-list/component-list.html @@ -2,8 +2,8 @@ - - {{component.name}} + + {{component.name}}
-
+
diff --git a/src/app/pages/component-list/component-list.ts b/src/app/pages/component-list/component-list.ts index 36f71e29d..3fe989818 100644 --- a/src/app/pages/component-list/component-list.ts +++ b/src/app/pages/component-list/component-list.ts @@ -7,7 +7,7 @@ import {ActivatedRoute, Router, RouterModule} from '@angular/router'; import {ComponentPageTitle} from '../page-title/page-title'; import {SvgViewerModule} from '../../shared/svg-viewer/svg-viewer'; import {CommonModule} from '@angular/common'; -import {MdCardModule} from '@angular/material'; +import {MatCardModule} from '@angular/material'; @Component({ selector: 'app-components', @@ -34,7 +34,7 @@ export class ComponentList { } @NgModule({ - imports: [SvgViewerModule, RouterModule, CommonModule, MdCardModule], + imports: [SvgViewerModule, RouterModule, CommonModule, MatCardModule], exports: [ComponentList], declarations: [ComponentList], providers: [DocumentationItems, ComponentPageTitle], diff --git a/src/app/pages/component-page-header/component-page-header.html b/src/app/pages/component-page-header/component-page-header.html index c4e37417d..52266ab16 100644 --- a/src/app/pages/component-page-header/component-page-header.html +++ b/src/app/pages/component-page-header/component-page-header.html @@ -1,6 +1,6 @@
-

{{getTitle()}}

diff --git a/src/app/pages/component-page-header/component-page-header.scss b/src/app/pages/component-page-header/component-page-header.scss index e034e0c70..b4ab77058 100644 --- a/src/app/pages/component-page-header/component-page-header.scss +++ b/src/app/pages/component-page-header/component-page-header.scss @@ -29,7 +29,7 @@ h1 { justify-content: center; } - md-icon { + mat-icon { font-size: 30px; height: 64px; width: 64px; diff --git a/src/app/pages/component-page-header/component-page-header.ts b/src/app/pages/component-page-header/component-page-header.ts index 076934903..f2cf3eb52 100644 --- a/src/app/pages/component-page-header/component-page-header.ts +++ b/src/app/pages/component-page-header/component-page-header.ts @@ -2,7 +2,7 @@ import {Component, EventEmitter, NgModule, Output} from '@angular/core'; import 'rxjs/add/operator/first'; import {ComponentPageTitle} from '../page-title/page-title'; import {NavigationFocusModule} from '../../shared/navigation-focus/navigation-focus'; -import {MdButtonModule, MdIconModule} from '@angular/material'; +import {MatButtonModule, MatIconModule} from '@angular/material'; @Component({ selector: 'component-page-header', @@ -20,7 +20,7 @@ export class ComponentPageHeader { } @NgModule({ - imports: [MdButtonModule, MdIconModule, NavigationFocusModule], + imports: [MatButtonModule, MatIconModule, NavigationFocusModule], exports: [ComponentPageHeader], declarations: [ComponentPageHeader], providers: [ComponentPageTitle], diff --git a/src/app/pages/component-sidenav/component-sidenav.html b/src/app/pages/component-sidenav/component-sidenav.html index c36bc03ea..01808a8b5 100644 --- a/src/app/pages/component-sidenav/component-sidenav.html +++ b/src/app/pages/component-sidenav/component-sidenav.html @@ -1,5 +1,5 @@ - - + - +
-
+ diff --git a/src/app/pages/component-sidenav/component-sidenav.spec.ts b/src/app/pages/component-sidenav/component-sidenav.spec.ts index 15bdc1a35..3a62734dd 100644 --- a/src/app/pages/component-sidenav/component-sidenav.spec.ts +++ b/src/app/pages/component-sidenav/component-sidenav.spec.ts @@ -1,5 +1,5 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import {MdSidenav} from '@angular/material'; +import {MatSidenav} from '@angular/material'; import {ComponentSidenav, ComponentSidenavModule} from './component-sidenav'; import {DocsAppTestingModule} from '../../testing/testing-module'; @@ -26,7 +26,7 @@ describe('ComponentSidenav', () => { fixture.detectChanges(); async(() => { - expect(component.sidenav instanceof MdSidenav).toBeTruthy(); + expect(component.sidenav instanceof MatSidenav).toBeTruthy(); expect(component.isScreenSmall()).toBeTruthy(); expect(component.sidenav.opened).toBe(false); }) diff --git a/src/app/pages/component-sidenav/component-sidenav.ts b/src/app/pages/component-sidenav/component-sidenav.ts index 23909e54f..26805d974 100644 --- a/src/app/pages/component-sidenav/component-sidenav.ts +++ b/src/app/pages/component-sidenav/component-sidenav.ts @@ -1,6 +1,6 @@ import {Component, NgZone, ViewEncapsulation, ViewChild, OnInit, NgModule} from '@angular/core'; import {DocumentationItems} from '../../shared/documentation-items/documentation-items'; -import {MdSidenav, MdSidenavModule} from '@angular/material'; +import {MatSidenav, MatSidenavModule} from '@angular/material'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {Router, RouterModule} from '@angular/router'; import {CommonModule} from '@angular/common'; @@ -25,7 +25,7 @@ export class ComponentSidenav implements OnInit { this.mediaMatcher.addListener(mql => zone.run(() => this.mediaMatcher = mql)); } - @ViewChild(MdSidenav) sidenav: MdSidenav; + @ViewChild(MatSidenav) sidenav: MatSidenav; ngOnInit() { this._router.events.subscribe(() => { @@ -43,7 +43,7 @@ export class ComponentSidenav implements OnInit { @NgModule({ imports: [ - MdSidenavModule, + MatSidenavModule, RouterModule, CommonModule, ComponentHeaderModule, diff --git a/src/app/pages/component-viewer/component-viewer.html b/src/app/pages/component-viewer/component-viewer.html index 853d4667f..31ee698c8 100644 --- a/src/app/pages/component-viewer/component-viewer.html +++ b/src/app/pages/component-viewer/component-viewer.html @@ -1,6 +1,6 @@
-
- - + {{guide.name}} - + diff --git a/src/app/pages/guide-list/guide-list.ts b/src/app/pages/guide-list/guide-list.ts index b41c075ba..d8f13e157 100644 --- a/src/app/pages/guide-list/guide-list.ts +++ b/src/app/pages/guide-list/guide-list.ts @@ -1,6 +1,6 @@ import {Component, NgModule, OnInit} from '@angular/core'; import {GuideItems} from '../../shared/guide-items/guide-items'; -import {MdListModule} from '@angular/material'; +import {MatListModule} from '@angular/material'; import {RouterModule} from '@angular/router'; import {FooterModule} from '../../shared/footer/footer'; import {CommonModule} from '@angular/common'; @@ -21,7 +21,7 @@ export class GuideList implements OnInit { @NgModule({ - imports: [MdListModule, RouterModule, FooterModule, CommonModule], + imports: [MatListModule, RouterModule, FooterModule, CommonModule], exports: [GuideList], declarations: [GuideList], providers: [GuideItems, ComponentPageTitle], diff --git a/src/app/pages/homepage/homepage.html b/src/app/pages/homepage/homepage.html index 49c70dd2b..d52bf4437 100644 --- a/src/app/pages/homepage/homepage.html +++ b/src/app/pages/homepage/homepage.html @@ -5,7 +5,7 @@

Angular Material

Material Design components for Angular

- Get started + Get started
@@ -59,7 +59,7 @@

Optimized for Angular

- Get started + Get started
diff --git a/src/app/pages/homepage/homepage.ts b/src/app/pages/homepage/homepage.ts index 0a809e5e6..d067f7489 100644 --- a/src/app/pages/homepage/homepage.ts +++ b/src/app/pages/homepage/homepage.ts @@ -1,6 +1,6 @@ import {Component, NgModule, OnInit} from '@angular/core'; import {SvgViewerModule} from '../../shared/svg-viewer/svg-viewer'; -import {MdButtonModule} from '@angular/material'; +import {MatButtonModule} from '@angular/material'; import {FooterModule} from '../../shared/footer/footer'; import {RouterModule} from '@angular/router'; import {ComponentPageTitle} from '../page-title/page-title'; @@ -19,7 +19,7 @@ export class Homepage implements OnInit { } @NgModule({ - imports: [SvgViewerModule, MdButtonModule, FooterModule, RouterModule], + imports: [SvgViewerModule, MatButtonModule, FooterModule, RouterModule], exports: [Homepage], declarations: [Homepage], }) diff --git a/src/app/shared/doc-viewer/doc-viewer-module.ts b/src/app/shared/doc-viewer/doc-viewer-module.ts index 0ca67fc92..3e5119671 100644 --- a/src/app/shared/doc-viewer/doc-viewer-module.ts +++ b/src/app/shared/doc-viewer/doc-viewer-module.ts @@ -2,11 +2,11 @@ import {DocViewer} from './doc-viewer'; import {ExampleViewer} from '../example-viewer/example-viewer'; import {PlunkerButtonModule} from '../plunker/plunker-button'; import { - MdButtonModule, - MdIconModule, - MdTabsModule, - MdTooltipModule, - MdSnackBarModule, + MatButtonModule, + MatIconModule, + MatTabsModule, + MatTooltipModule, + MatSnackBarModule, PortalModule } from '@angular/material'; import {CommonModule} from '@angular/common'; @@ -18,11 +18,11 @@ import {CopierService} from '../copier/copier.service'; // ExampleViewer is included in the DocViewerModule because they have a circular dependency. @NgModule({ imports: [ - MdButtonModule, - MdIconModule, - MdTooltipModule, - MdSnackBarModule, - MdTabsModule, + MatButtonModule, + MatIconModule, + MatTooltipModule, + MatSnackBarModule, + MatTabsModule, CommonModule, PortalModule, PlunkerButtonModule diff --git a/src/app/shared/doc-viewer/header-link.ts b/src/app/shared/doc-viewer/header-link.ts index 58530cb47..65a53cb57 100644 --- a/src/app/shared/doc-viewer/header-link.ts +++ b/src/app/shared/doc-viewer/header-link.ts @@ -23,7 +23,7 @@ import {Router} from '@angular/router'; class="docs-markdown-a docs-header-link" aria-label="Link to this heading" [href]="url"> - link + link ` }) diff --git a/src/app/shared/example-viewer/example-viewer.html b/src/app/shared/example-viewer/example-viewer.html index 1961f21c3..601d1d192 100644 --- a/src/app/shared/example-viewer/example-viewer.html +++ b/src/app/shared/example-viewer/example-viewer.html @@ -2,34 +2,34 @@
{{exampleData?.title}}
-
- + - +
-
-
-
+ +
diff --git a/src/app/shared/example-viewer/example-viewer.spec.ts b/src/app/shared/example-viewer/example-viewer.spec.ts index 26a8d636e..4dfb60697 100644 --- a/src/app/shared/example-viewer/example-viewer.spec.ts +++ b/src/app/shared/example-viewer/example-viewer.spec.ts @@ -13,12 +13,12 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import { - MdAutocompleteModule, - MdInputModule, - MdSlideToggleModule + MatAutocompleteModule, + MatInputModule, + MatSlideToggleModule } from '@angular/material'; import {CopierService} from '../copier/copier.service'; -import {MdSnackBar} from '@angular/material'; +import {MatSnackBar} from '@angular/material'; const exampleKey = 'autocomplete-overview'; @@ -113,7 +113,7 @@ describe('ExampleViewer', () => { }); it('should display a message when copy succeeds', () => { - const snackBar: MdSnackBar = TestBed.get(MdSnackBar); + const snackBar: MatSnackBar = TestBed.get(MatSnackBar); const copierService: CopierService = TestBed.get(CopierService); spyOn(snackBar, 'open'); spyOn(copierService, 'copyText').and.returnValue(true); @@ -122,7 +122,7 @@ describe('ExampleViewer', () => { }); it('should display an error when copy fails', () => { - const snackBar: MdSnackBar = TestBed.get(MdSnackBar); + const snackBar: MatSnackBar = TestBed.get(MatSnackBar); const copierService: CopierService = TestBed.get(CopierService); spyOn(snackBar, 'open'); spyOn(copierService, 'copyText').and.returnValue(false); @@ -139,9 +139,9 @@ describe('ExampleViewer', () => { // to compile all of the examples for these tests. @NgModule({ imports: [ - MdInputModule, - MdAutocompleteModule, - MdSlideToggleModule, + MatInputModule, + MatAutocompleteModule, + MatSlideToggleModule, FormsModule, CommonModule, ReactiveFormsModule, diff --git a/src/app/shared/example-viewer/example-viewer.ts b/src/app/shared/example-viewer/example-viewer.ts index 3c88fb94b..27aadd655 100644 --- a/src/app/shared/example-viewer/example-viewer.ts +++ b/src/app/shared/example-viewer/example-viewer.ts @@ -1,5 +1,5 @@ import {Component, Input} from '@angular/core'; -import {ComponentPortal, MdSnackBar} from '@angular/material'; +import {ComponentPortal, MatSnackBar} from '@angular/material'; import 'rxjs/add/operator/first'; import {EXAMPLE_COMPONENTS, LiveExample} from '@angular/material-examples'; @@ -24,7 +24,7 @@ export class ExampleViewer { showSource = false; constructor( - private snackbar: MdSnackBar, + private snackbar: MatSnackBar, private copier: CopierService) { } get example() { diff --git a/src/app/shared/navbar/navbar.html b/src/app/shared/navbar/navbar.html index dc69061d4..0d1c1cf15 100644 --- a/src/app/shared/navbar/navbar.html +++ b/src/app/shared/navbar/navbar.html @@ -1,23 +1,23 @@ diff --git a/src/app/shared/navbar/navbar.ts b/src/app/shared/navbar/navbar.ts index 51b6a2849..0821e9db3 100644 --- a/src/app/shared/navbar/navbar.ts +++ b/src/app/shared/navbar/navbar.ts @@ -1,6 +1,6 @@ import {Component, NgModule} from '@angular/core'; import {DomSanitizer} from '@angular/platform-browser'; -import {MdButtonModule, MdMenuModule} from '@angular/material'; +import {MatButtonModule, MatMenuModule} from '@angular/material'; import {RouterModule} from '@angular/router'; import {ThemePickerModule} from '../theme-picker/theme-picker'; @@ -12,7 +12,7 @@ import {ThemePickerModule} from '../theme-picker/theme-picker'; export class NavBar {} @NgModule({ - imports: [MdButtonModule, MdMenuModule, RouterModule, ThemePickerModule], + imports: [MatButtonModule, MatMenuModule, RouterModule, ThemePickerModule], exports: [NavBar], declarations: [NavBar], }) diff --git a/src/app/shared/plunker/plunker-button.html b/src/app/shared/plunker/plunker-button.html index 9943db070..7ac96a451 100644 --- a/src/app/shared/plunker/plunker-button.html +++ b/src/app/shared/plunker/plunker-button.html @@ -1,13 +1,13 @@ -
-
diff --git a/src/app/shared/plunker/plunker-button.ts b/src/app/shared/plunker/plunker-button.ts index b1aa7e89b..284c29d5f 100644 --- a/src/app/shared/plunker/plunker-button.ts +++ b/src/app/shared/plunker/plunker-button.ts @@ -1,7 +1,7 @@ import {Component, Input, NgModule} from '@angular/core'; import {PlunkerWriter} from './plunker-writer'; import {ExampleData} from '@angular/material-examples'; -import {MdButtonModule, MdIconModule, MdTooltipModule} from '@angular/material'; +import {MatButtonModule, MatIconModule, MatTooltipModule} from '@angular/material'; @Component({ selector: 'plunker-button', @@ -45,7 +45,7 @@ export class PlunkerButton { } @NgModule({ - imports: [MdTooltipModule, MdButtonModule, MdIconModule], + imports: [MatTooltipModule, MatButtonModule, MatIconModule], exports: [PlunkerButton], declarations: [PlunkerButton], providers: [PlunkerWriter], diff --git a/src/app/shared/theme-picker/theme-picker.html b/src/app/shared/theme-picker/theme-picker.html index d04a87a82..358e6e958 100644 --- a/src/app/shared/theme-picker/theme-picker.html +++ b/src/app/shared/theme-picker/theme-picker.html @@ -1,18 +1,18 @@ - - - - - -
+ + + + +
- check_circle + check_circle
- - - +
+
+
diff --git a/src/app/shared/theme-picker/theme-picker.scss b/src/app/shared/theme-picker/theme-picker.scss index 05fb1868b..cd010ae3c 100644 --- a/src/app/shared/theme-picker/theme-picker.scss +++ b/src/app/shared/theme-picker/theme-picker.scss @@ -6,11 +6,11 @@ $theme-picker-accent-stripe-size: 6px; .docs-theme-picker-menu { - .md-menu-content { + .mat-menu-content { padding: $theme-picker-menu-padding; } - [md-menu-item] { + [mat-menu-item] { flex: 0 0 auto; padding: 0; overflow: hidden; diff --git a/src/app/shared/theme-picker/theme-picker.ts b/src/app/shared/theme-picker/theme-picker.ts index c721f45ee..8bd5bae72 100644 --- a/src/app/shared/theme-picker/theme-picker.ts +++ b/src/app/shared/theme-picker/theme-picker.ts @@ -2,8 +2,8 @@ import {Component, ViewEncapsulation, ChangeDetectionStrategy, NgModule} from '@ import {StyleManager} from '../style-manager/style-manager'; import {ThemeStorage, DocsSiteTheme} from './theme-storage/theme-storage'; import { - MdButtonModule, MdGridListModule, MdIconModule, MdMenuModule, - MdTooltipModule + MatButtonModule, MatGridListModule, MatIconModule, MatMenuModule, + MatTooltipModule } from '@angular/material'; import {CommonModule} from '@angular/common'; @@ -78,11 +78,11 @@ export class ThemePicker { @NgModule({ imports: [ - MdButtonModule, - MdIconModule, - MdMenuModule, - MdGridListModule, - MdTooltipModule, + MatButtonModule, + MatIconModule, + MatMenuModule, + MatGridListModule, + MatTooltipModule, CommonModule ], exports: [ThemePicker], diff --git a/src/app/testing/testing-module.ts b/src/app/testing/testing-module.ts index 1828d78a5..9d0f5a0ef 100644 --- a/src/app/testing/testing-module.ts +++ b/src/app/testing/testing-module.ts @@ -2,7 +2,7 @@ import {NgModule} from '@angular/core'; import {HttpModule, XHRBackend} from '@angular/http'; import {MockBackend} from '@angular/http/testing'; import {RouterTestingModule} from '@angular/router/testing'; -import {MATERIAL_SANITY_CHECKS} from '@angular/material'; +import {MATERIAL_SANITY_CHECKS, MATERIAL_COMPATIBILITY_MODE} from '@angular/material'; @NgModule({ imports: [RouterTestingModule, HttpModule], @@ -11,6 +11,7 @@ import {MATERIAL_SANITY_CHECKS} from '@angular/material'; MockBackend, {provide: XHRBackend, useExisting: MockBackend}, {provide: MATERIAL_SANITY_CHECKS, useValue: false}, + {provide: MATERIAL_COMPATIBILITY_MODE, useValue: true}, ], }) export class DocsAppTestingModule {}