Skip to content

Commit 5f8edc2

Browse files
committed
fix(button): remove classes from buttons with categories
references #6237
1 parent d5daaf5 commit 5f8edc2

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

ionic/components/action-sheet/action-sheet.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,14 +222,14 @@ export class ActionSheet extends ViewController {
222222
'<div class="action-sheet-group">' +
223223
'<div class="action-sheet-title" id="{{hdrId}}" *ngIf="d.title">{{d.title}}</div>' +
224224
'<div class="action-sheet-sub-title" id="{{descId}}" *ngIf="d.subTitle">{{d.subTitle}}</div>' +
225-
'<button category="action-sheet-button" (click)="click(b)" *ngFor="#b of d.buttons" class="action-sheet-button disable-hover" [ngClass]="b.cssClass">' +
225+
'<button category="action-sheet-button" (click)="click(b)" *ngFor="#b of d.buttons" class="disable-hover" [ngClass]="b.cssClass">' +
226226
'<ion-icon [name]="b.icon" *ngIf="b.icon" class="action-sheet-icon"></ion-icon> ' +
227227
'{{b.text}}' +
228228
'<ion-button-effect></ion-button-effect>' +
229229
'</button>' +
230230
'</div>' +
231231
'<div class="action-sheet-group" *ngIf="d.cancelButton">' +
232-
'<button category="action-sheet-button" (click)="click(d.cancelButton)" class="action-sheet-button action-sheet-cancel disable-hover" [ngClass]="d.cancelButton.cssClass">' +
232+
'<button category="action-sheet-button" (click)="click(d.cancelButton)" class="action-sheet-cancel disable-hover" [ngClass]="d.cancelButton.cssClass">' +
233233
'<ion-icon [name]="d.cancelButton.icon" *ngIf="d.cancelButton.icon" class="action-sheet-icon"></ion-icon> ' +
234234
'{{d.cancelButton.text}}' +
235235
'<ion-button-effect></ion-button-effect>' +

ionic/components/alert/alert.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ export class Alert extends ViewController {
353353

354354
'</div>' +
355355
'<div class="alert-button-group" [ngClass]="{vertical: d.buttons.length>2}">' +
356-
'<button category="alert-button" *ngFor="#b of d.buttons" (click)="btnClick(b)" [ngClass]="b.cssClass" class="alert-button">' +
356+
'<button category="alert-button" *ngFor="#b of d.buttons" (click)="btnClick(b)" [ngClass]="b.cssClass">' +
357357
'{{b.text}}' +
358358
'<ion-button-effect></ion-button-effect>' +
359359
'</button>' +

ionic/components/navbar/navbar.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class ToolbarBackground {
9191
selector: 'ion-navbar',
9292
template:
9393
'<div class="toolbar-background"></div>' +
94-
'<button class="back-button bar-button bar-button-default" [hidden]="_hideBb">' +
94+
'<button category="bar-button" class="back-button" [hidden]="_hideBb">' +
9595
'<span class="button-inner">' +
9696
'<ion-icon class="back-button-icon" [name]="_bbIcon"></ion-icon>' +
9797
'<span class="back-button-text">' +

0 commit comments

Comments
 (0)