Skip to content

Commit

Permalink
feat(filtering): change button type to outlined #5496
Browse files Browse the repository at this point in the history
  • Loading branch information
DiyanDimitrov committed Aug 14, 2019
1 parent 7ae312d commit 7580b3e
Showing 1 changed file with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,32 @@ <h4 class="igx-typography__h6">

<article #expressionsContainer class="igx-excel-filter__secondary-main" style="padding: 10px;">
<ng-container *ngIf="!rootGroup">
<button igxButton [displayDensity]="displayDensity" (click)="addAndGroup()">
<button igxButton="outlined" [displayDensity]="displayDensity" (click)="addAndGroup()">
<igx-icon fontSet="material">add</igx-icon>
<span>"And" Group</span>
</button>
<button igxButton [displayDensity]="displayDensity" (click)="addOrGroup()">
<button igxButton="outlined" [displayDensity]="displayDensity" (click)="addOrGroup()">
<igx-icon fontSet="material">add</igx-icon>
<span>"Or" Group</span>
</button>
</ng-container>

<ng-template #addExpressionsTemplate let-expressionItem let-afterExpression="afterExpression">
<button igxButton
<button igxButton="outlined"
[displayDensity]="displayDensity"
[disabled]="editedExpression"
(click)="addCondition(expressionItem, afterExpression)">
<igx-icon fontSet="material">add</igx-icon>
<span>Condition</span>
</button>
<button igxButton
<button igxButton="outlined"
[displayDensity]="displayDensity"
[disabled]="editedExpression"
(click)="addAndGroup(expressionItem, afterExpression)">
<igx-icon fontSet="material">add</igx-icon>
<span>"And" Group</span>
</button>
<button igxButton
<button igxButton="outlined"
[displayDensity]="displayDensity"
[disabled]="editedExpression"
(click)="addOrGroup(expressionItem, afterExpression)">
Expand Down Expand Up @@ -143,7 +143,7 @@ <h4 class="igx-typography__h6">
</ng-container>
<div *ngIf="currentGroup === expressionItem">
<ng-container *ngTemplateOutlet="addExpressionsTemplate; context: context(expressionItem)"></ng-container>
<button igxButton
<button igxButton="outlined"
*ngIf="expressionItem !== rootGroup"
[displayDensity]="displayDensity"
[disabled]="editedExpression"
Expand Down Expand Up @@ -186,21 +186,21 @@ <h4 class="igx-typography__h6">
</button>
</igx-buttongroup>

<button igxButton [displayDensity]="displayDensity" [disabled]="!selectedGroups[0].parent" (click)="ungroup()">
<button igxButton="outlined" [displayDensity]="displayDensity" [disabled]="!selectedGroups[0].parent" (click)="ungroup()">
Ungroup
</button>
<button igxButton [displayDensity]="displayDensity" [disabled]="!selectedGroups[0].parent" (click)="deleteGroup()">
<button igxButton="outlined" [displayDensity]="displayDensity" [disabled]="!selectedGroups[0].parent" (click)="deleteGroup()">
Delete
</button>
</ng-container>
<ng-container *ngIf="selectedGroups.length !== 1 && selectedExpressions.length > 1">
<button igxButton [displayDensity]="displayDensity" (click)="createAndGroup()">
<button igxButton="outlined" [displayDensity]="displayDensity" (click)="createAndGroup()">
Create "And" Group
</button>
<button igxButton [displayDensity]="displayDensity" (click)="createOrGroup()">
<button igxButton="outlined" [displayDensity]="displayDensity" (click)="createOrGroup()">
Create "Or" Group
</button>
<button igxButton [displayDensity]="displayDensity" (click)="deleteFilters()">
<button igxButton="outlined" [displayDensity]="displayDensity" (click)="deleteFilters()">
Delete Filters
</button>
</ng-container>
Expand Down

0 comments on commit 7580b3e

Please sign in to comment.