Skip to content

Commit 5e52300

Browse files
committed
fix(query-builder): fix jumping and indigo border-radius for legend items
1 parent 9e69a73 commit 5e52300

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

projects/igniteui-angular/src/lib/core/styles/components/query-builder/_query-builder-theme.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,10 @@
322322
%filter-tree__expression-actions {
323323
display: inline-flex;
324324
gap: $gap;
325-
box-sizing: border-box;
325+
326+
span {
327+
display: inline-flex;
328+
}
326329

327330
igx-icon {
328331
cursor: pointer;
@@ -396,8 +399,8 @@
396399
width: rem(24px);
397400
height: rem(24px);
398401
background: white;
399-
border-radius: $border-radius;
400402
margin-inline-end: rem(8px);
403+
border-radius: if($variant != 'indigo', $border-radius, #{rem(4px)});
401404
}
402405

403406
+ %filter-legend__item {

projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ <h6 class="igx-filter-empty__title">
152152
(click)="enterExpressionEdit(expressionItem)">
153153
<igx-icon
154154
family="default"
155-
name="edit"
155+
name="edit"
156156
>
157157
</igx-icon>
158158
</span>
@@ -161,7 +161,7 @@ <h6 class="igx-filter-empty__title">
161161
(click)="enterExpressionAdd(expressionItem)">
162162
<igx-icon
163163
family="default"
164-
name="add"
164+
name="add"
165165
*ngIf="
166166
!expressionItem.inAddMode &&
167167
(expressionItem.parent !== currentGroup ||
@@ -177,8 +177,8 @@ <h6 class="igx-filter-empty__title">
177177
<div igxButton class="igx-filter-tree__details-button" *ngIf="!expressionItem.inEditMode && expressionItem.expression.searchTree"
178178
(click)="expanderClick($event, expressionItem)">
179179
<span>{{this.resourceStrings.igx_query_builder_details}}</span>
180-
<igx-icon *ngIf="!expressionItem.expanded" family="default" name="unfold_less" role="button"></igx-icon>
181-
<igx-icon *ngIf="expressionItem.expanded" family="default" name="unfold_more" role="button"></igx-icon>
180+
<igx-icon *ngIf="expressionItem.expanded" family="default" name="unfold_less" role="button"></igx-icon>
181+
<igx-icon *ngIf="!expressionItem.expanded" family="default" name="unfold_more" role="button"></igx-icon>
182182
</div>
183183

184184
</div>

src/styles/_variables.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@use 'sass:map';
22
@use '../../projects/igniteui-angular/src/lib/core/styles/themes' as *;
33

4-
$palette: $light-material-palette;
5-
$schema: $light-material-schema;
6-
$typeface: $material-typeface;
7-
$type-scale: $material-type-scale;
4+
$palette: $light-indigo-palette;
5+
$schema: $light-indigo-schema;
6+
$typeface: $indigo-typeface;
7+
$type-scale: $indigo-type-scale;
88
$variant: map.get($schema, '_meta', 'variant');
99

1010
$background-color: var(--ig-gray-900-contrast);

0 commit comments

Comments
 (0)