-
Notifications
You must be signed in to change notification settings - Fork 6.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: use mat in internal templates (#7219)
- Loading branch information
1 parent
f2419bf
commit 7fe37e5
Showing
46 changed files
with
133 additions
and
128 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
<span class="mat-button-wrapper"><ng-content></ng-content></span> | ||
<div md-ripple class="mat-button-ripple" | ||
<div mat-ripple class="mat-button-ripple" | ||
[class.mat-button-ripple-round]="_isRoundButton || _isIconButton" | ||
[mdRippleDisabled]="_isRippleDisabled()" | ||
[mdRippleCentered]="_isIconButton" | ||
[mdRippleTrigger]="_getHostElement()"></div> | ||
[matRippleDisabled]="_isRippleDisabled()" | ||
[matRippleCentered]="_isIconButton" | ||
[matRippleTrigger]="_getHostElement()"></div> | ||
<div class="mat-button-focus-overlay"></div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,10 @@ | ||
<span [ngSwitch]="_isCompatibilityMode" *ngIf="multiple"> | ||
<mat-pseudo-checkbox class="mat-option-pseudo-checkbox" *ngSwitchCase="true" | ||
<span *ngIf="multiple"> | ||
<mat-pseudo-checkbox class="mat-option-pseudo-checkbox" | ||
[state]="selected ? 'checked' : ''" [disabled]="disabled"></mat-pseudo-checkbox> | ||
<md-pseudo-checkbox class="mat-option-pseudo-checkbox" *ngSwitchDefault | ||
[state]="selected ? 'checked' : ''" [disabled]="disabled"></md-pseudo-checkbox> | ||
</span> | ||
|
||
<ng-content></ng-content> | ||
<div class="mat-option-ripple" md-ripple | ||
[mdRippleTrigger]="_getHostElement()" | ||
[mdRippleDisabled]="disabled || disableRipple"> | ||
<div class="mat-option-ripple" mat-ripple | ||
[matRippleTrigger]="_getHostElement()" | ||
[matRippleDisabled]="disabled || disableRipple"> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
<button md-icon-button type="button" [attr.aria-label]="_intl.openCalendarLabel" | ||
<button mat-icon-button type="button" [attr.aria-label]="_intl.openCalendarLabel" | ||
[disabled]="disabled" (click)="_open($event)"> | ||
<md-icon> | ||
<mat-icon> | ||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="100%" height="100%" | ||
fill="currentColor" style="vertical-align: top" focusable="false"> | ||
<path d="M0 0h24v24H0z" fill="none"/> | ||
<path d="M19 3h-1V1h-2v2H8V1H6v2H5c-1.11 0-1.99.9-1.99 2L3 19c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V8h14v11zM7 10h5v5H7z"/> | ||
</svg> | ||
</md-icon> | ||
</mat-icon> | ||
</button> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
<ng-content></ng-content> | ||
<div class="mat-menu-ripple" *ngIf="!disabled" md-ripple [mdRippleTrigger]="_getHostElement()"> | ||
<div class="mat-menu-ripple" *ngIf="!disabled" mat-ripple [matRippleTrigger]="_getHostElement()"> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
@andrewseguin mat-icon didn't need this kind of stuff? I'm experiencing issues with the compatibility mode for entryComponents and I suspect this have something to do with this line not present on
MdIcon
. #7277