skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(card): allow md-card-title and subtitle to be used as attributes (#4122)

Browse Source
This commit is contained in:
Will Howell
2017-04-21 12:37:36 -04:00
committed by Kara
parent 7de316f2aa
commit a2000246f5
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/card/card-header.html
+2 -1
View File
@@ -1,6 +1,7 @@
<ng-content select="[md-card-avatar], [mat-card-avatar]"></ng-content>
<div class="mat-card-header-text">
<ng-content
select="md-card-title, mat-card-title, md-card-subtitle, mat-card-subtitle"></ng-content>
select="md-card-title, mat-card-title, md-card-subtitle, mat-card-subtitle,
[md-card-title], [mat-card-title], [md-card-subtitle], [mat-card-subtitle]"></ng-content>
</div>
<ng-content></ng-content>
src/lib/card/card-title-group.html
+2 -1
View File
@@ -1,6 +1,7 @@
<div>
<ng-content
select="md-card-title, mat-card-title, md-card-subtitle, mat-card-subtitle"></ng-content>
select="md-card-title, mat-card-title, md-card-subtitle, mat-card-subtitle,
[md-card-title], [mat-card-title], [md-card-subtitle], [mat-card-subtitle]"></ng-content>
</div>
<ng-content select="img"></ng-content>
<ng-content></ng-content>
src/lib/card/card.ts
+2 -2
View File
@@ -23,7 +23,7 @@ export class MdCardContent {}
* @docs-private
*/
@Directive({
selector: 'md-card-title, mat-card-title',
selector: 'md-card-title, mat-card-title, [md-card-title], [mat-card-title]',
host: {
'[class.mat-card-title]': 'true'
}
@@ -35,7 +35,7 @@ export class MdCardTitle {}
* @docs-private
*/
@Directive({
selector: 'md-card-subtitle, mat-card-subtitle',
selector: 'md-card-subtitle, mat-card-subtitle, [md-card-subtitle], [mat-card-subtitle]',
host: {
'[class.mat-card-subtitle]': 'true'
}
src/lib/core/compatibility/compatibility.ts
+4
View File
@@ -32,6 +32,8 @@ export class MdCompatibilityInvalidPrefixError extends MdError {
/** Selector that matches all elements that may have style collisions with AngularJS Material. */
export const MAT_ELEMENTS_SELECTOR = `
[mat-button],
[mat-card-subtitle],
[mat-card-title],
[mat-dialog-actions],
[mat-dialog-close],
[mat-dialog-content],
@@ -92,6 +94,8 @@ export const MAT_ELEMENTS_SELECTOR = `
/** Selector that matches all elements that may have style collisions with AngularJS Material. */
export const MD_ELEMENTS_SELECTOR = `
[md-button],
[md-card-subtitle],
[md-card-title],
[md-dialog-actions],
[md-dialog-close],
[md-dialog-content],