Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(aio): upgrade to @angular/material#2.0.0-beta.3 #15606

Merged
merged 1 commit into from Apr 12, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion aio/package.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion 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';
Expand Down
8 changes: 1 addition & 7 deletions aio/src/app/app.module.ts
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions aio/src/app/embedded/code/code-tabs.component.ts
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions 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
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
6 changes: 3 additions & 3 deletions aio/yarn.lock
Expand Up @@ -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"
Expand Down