iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Igor Minar 2017-04-12 12:25:11 -07:00 committed by GitHub
parent 28c2a71cfc
commit 4a052cd343
7 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aio/package.json
View File

@ -35,7 +35,7 @@
"@angular/core": "next", "@angular/core": "next",
"@angular/forms": "next", "@angular/forms": "next",
"@angular/http": "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": "next",
"@angular/platform-browser-dynamic": "next", "@angular/platform-browser-dynamic": "next",
"@angular/platform-server": "next", "@angular/platform-server": "next",

2
aio/src/app/app.component.ts
View File

@ -1,6 +1,6 @@
import { Component, ElementRef, HostListener, OnInit, import { Component, ElementRef, HostListener, OnInit,
QueryList, ViewChild, ViewChildren } from '@angular/core'; 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 { AutoScrollService } from 'app/shared/auto-scroll.service';
import { CurrentNode, NavigationService, NavigationViews, NavigationNode, VersionInfo } from 'app/navigation/navigation.service'; import { CurrentNode, NavigationService, NavigationViews, NavigationNode, VersionInfo } from 'app/navigation/navigation.service';

8
aio/src/app/app.module.ts
View File

@ -5,13 +5,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { Location, LocationStrategy, PathLocationStrategy } from '@angular/common'; import { Location, LocationStrategy, PathLocationStrategy } from '@angular/common';
import { MdToolbarModule } from '@angular/material/toolbar'; import { MdToolbarModule, MdButtonModule, MdIconModule, MdInputModule, MdSidenavModule, MdTabsModule, Platform} from '@angular/material';
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';
// Temporary fix for MdSidenavModule issue: // Temporary fix for MdSidenavModule issue:
// crashes with "missing first" operator when SideNav.mode is "over" // crashes with "missing first" operator when SideNav.mode is "over"

4
aio/src/app/embedded/code/code-tabs.component.ts
View File

@ -19,9 +19,9 @@ export interface TabInfo {
template: ` template: `
<md-tab-group class="code-tab-group"> <md-tab-group class="code-tab-group">
<md-tab style="overflow-y: hidden;" *ngFor="let tab of tabs"> <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> <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> <aio-code [code]="tab.code" [language]="tab.language" [linenums]="tab.linenums" class="{{ tab.class }}"></aio-code>
</md-tab> </md-tab>
</md-tab-group> </md-tab-group>

4
aio/src/styles/main.scss
View File

@ -1,8 +1,8 @@
// import global themes // import global themes
@import '~@angular/material/core/theming/all-theme'; @import '~@angular/material/theming';
@import './ng-io-theme'; @import './ng-io-theme';
// import global variables / // import global variables /
@import './constants'; @import './constants';
// import global mixins // import global mixins

2
aio/src/styles/ng-io-theme.scss
View File

@ -1,4 +1,4 @@
@import '~@angular/material/core/theming/all-theme'; @import '~@angular/material/theming';
// Plus imports for other components in your app. // Plus imports for other components in your app.
// Include the base styles for Angular Material core. We include this here so that you only // Include the base styles for Angular Material core. We include this here so that you only

6
aio/yarn.lock
View File

@ -98,9 +98,9 @@
version "4.0.0" version "4.0.0"
resolved "https://registry.yarnpkg.com/@angular/http/-/http-4.0.0.tgz#45a538eac42a0b13f3744c7e8bafeb17d58da31c" resolved "https://registry.yarnpkg.com/@angular/http/-/http-4.0.0.tgz#45a538eac42a0b13f3744c7e8bafeb17d58da31c"
"@angular/material@https://github.com/angular/material2-builds": "@angular/material@^2.0.0-beta.3":
version "2.0.0-beta.2" version "2.0.0-beta.3"
resolved "https://github.com/angular/material2-builds#d7f549850cfd94b31bb624e2702b61305fd6337d" resolved "https://registry.yarnpkg.com/@angular/material/-/material-2.0.0-beta.3.tgz#ec31dee61d7300ece28fee476852db236ded1e13"
"@angular/platform-browser-dynamic@next": "@angular/platform-browser-dynamic@next":
version "4.0.0" version "4.0.0"