cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(aio): hand fix the renaming md->mat issues (#19702)

Browse Source 
These are changes that the mat-switcher missed and I had to make them by hand.

PR Close #19702
This commit is contained in:
Igor Minar 2017-10-13 13:08:32 -07:00 committed by Matias Niemelä
parent 415e75716a
commit 71291aa2c0
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,7 +287,7 @@ export class AppComponent implements OnInit {
@HostListener('window:scroll') @HostListener('window:scroll')
onScroll() { onScroll() {
if (!this.tocMaxHeightOffset) { if (!this.tocMaxHeightOffset) {
// Must wait until now for md-toolbar to be measurable. // Must wait until now for mat-toolbar to be measurable.
const el = this.hostElement.nativeElement as Element; const el = this.hostElement.nativeElement as Element;
this.tocMaxHeightOffset = this.tocMaxHeightOffset =
el.querySelector('footer').clientHeight + el.querySelector('footer').clientHeight +

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

@ -17,7 +17,7 @@ import {
Platform Platform
} from '@angular/material'; } from '@angular/material';
// Temporary fix for MdSidenavModule issue: // Temporary fix for MatSidenavModule issue:
// crashes with "missing first" operator when SideNav.mode is "over" // crashes with "missing first" operator when SideNav.mode is "over"
import 'rxjs/add/operator/first'; import 'rxjs/add/operator/first';
@ -49,7 +49,7 @@ import { WindowToken, windowProvider } from 'app/shared/window';
import { SharedModule } from 'app/shared/shared.module'; import { SharedModule } from 'app/shared/shared.module';
// These are the hardcoded inline svg sources to be used by the `<md-icon>` component // These are the hardcoded inline svg sources to be used by the `<mat-icon>` component
export const svgIconProviders = [ export const svgIconProviders = [
{ {
provide: SVG_ICONS, provide: SVG_ICONS,

2
aio/src/app/embedded/code/code.component.spec.ts
View File

@ -267,7 +267,7 @@ describe('CodeComponent', () => {
@Component({ @Component({
selector: 'aio-host-comp', selector: 'aio-host-comp',
template: ` template: `
<aio-code md-no-ink [code]="code" [language]="language" <aio-code [code]="code" [language]="language"
[linenums]="linenums" [path]="path" [region]="region" [linenums]="linenums" [path]="path" [region]="region"
[hideCopy]="hideCopy" [title]="title"></aio-code> [hideCopy]="hideCopy" [title]="title"></aio-code>
` `

4
aio/src/styles/2-modules/_buttons.scss
View File

@ -1,7 +1,7 @@
/* Button Styles */ /* Button Styles */
.button, .button,
a.button.md-button { a.button.mat-button {
display: inline-block; display: inline-block;
line-height: 32px; line-height: 32px;
padding: 0px 16px; padding: 0px 16px;
@ -61,7 +61,7 @@ a.button.md-button {
} }
&.button-shield, &.button-shield,
&.button-shield.md-button { &.button-shield.mat-button {
background-color: $blue; background-color: $blue;
background: $blue url('assets/images/logos/angular/angular_whiteTransparent.svg') 24px 13px no-repeat; background: $blue url('assets/images/logos/angular/angular_whiteTransparent.svg') 24px 13px no-repeat;
color: rgba($white, .87); color: rgba($white, .87);