Skip to content

Commit afe165a

Browse files
committed
Rename background to backgroundColor
1 parent 7345fd7 commit afe165a

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

src/demo-app/tabs/tabs-demo.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h1>Tab Nav Bar</h1>
66
<button md-button (click)="toggleBackground()">Toggle background</button>
77

88
<div class="demo-nav-bar">
9-
<nav md-tab-nav-bar aria-label="weather navigation links" [background]="tabNavBackground">
9+
<nav md-tab-nav-bar aria-label="weather navigation links" [backgroundColor]="tabNavBackground">
1010
<a md-tab-link
1111
*ngFor="let tabLink of tabLinks; let i = index"
1212
[routerLink]="tabLink.link"
@@ -265,7 +265,7 @@ <h1>Accent tabs</h1>
265265
</md-tab-group>
266266

267267
<h1>Tabs with background color</h1>
268-
<md-tab-group class="demo-tab-group" background="primary" color="accent">
268+
<md-tab-group class="demo-tab-group" backgroundColor="primary" color="accent">
269269
<md-tab label="Earth">
270270
<div class="tab-content">
271271
This tab is about the Earth!
@@ -276,4 +276,4 @@ <h1>Tabs with background color</h1>
276276
This tab is about combustion!
277277
</div>
278278
</md-tab>
279-
</md-tab-group>
279+
</md-tab-group>

src/lib/tabs/tab-group.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,19 +119,19 @@ export class MdTabGroup extends _MdTabGroupMixinBase implements CanColor, AfterC
119119

120120
/** Background color of the tab group. */
121121
@Input()
122-
get background(): ThemePalette { return this._background; }
123-
set background(value: ThemePalette) {
122+
get backgroundColor(): ThemePalette { return this._backgroundColor; }
123+
set backgroundColor(value: ThemePalette) {
124124
let nativeElement = this._elementRef.nativeElement;
125125

126-
this._renderer.removeClass(nativeElement, `mat-background-${this.background}`);
126+
this._renderer.removeClass(nativeElement, `mat-background-${this.backgroundColor}`);
127127

128128
if (value) {
129129
this._renderer.addClass(nativeElement, `mat-background-${value}`);
130130
}
131131

132-
this._background = value;
132+
this._backgroundColor = value;
133133
}
134-
private _background: ThemePalette;
134+
private _backgroundColor: ThemePalette;
135135

136136
/** Output to enable support for two-way binding on `[(selectedIndex)]` */
137137
@Output() get selectedIndexChange(): Observable<number> {

src/lib/tabs/tab-nav-bar/tab-nav-bar.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,19 @@ export class MdTabNav extends _MdTabNavMixinBase implements AfterContentInit, Ca
7171

7272
/** Background color of the tab nav. */
7373
@Input()
74-
get background(): ThemePalette { return this._background; }
75-
set background(value: ThemePalette) {
74+
get backgroundColor(): ThemePalette { return this._backgroundColor; }
75+
set backgroundColor(value: ThemePalette) {
7676
let nativeElement = this._elementRef.nativeElement;
7777

78-
this._renderer.removeClass(nativeElement, `mat-background-${this.background}`);
78+
this._renderer.removeClass(nativeElement, `mat-background-${this.backgroundColor}`);
7979

8080
if (value) {
8181
this._renderer.addClass(nativeElement, `mat-background-${value}`);
8282
}
8383

84-
this._background = value;
84+
this._backgroundColor = value;
8585
}
86-
private _background: ThemePalette;
86+
private _backgroundColor: ThemePalette;
8787

8888
constructor(renderer: Renderer2,
8989
elementRef: ElementRef,

0 commit comments

Comments
 (0)