Skip to content

Commit 79c05c5

Browse files
committed
fix(query-builder): fix for comments
- make sure that the icon buttons are outlined - change the size of the fields in bootstrap - change the label inside the ghost drop indicator - change the padding inside the ghost drop
1 parent 1c3a913 commit 79c05c5

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
$not-bootstrap-theme: not($bootstrap-theme);
107107

108108
// Custom colors alpha
109-
$alpha-hover: .06;
109+
$alpha-hover: .08;
110110
$alpha-focus: .16;
111111
$alpha-focus-hover: .24;
112112

@@ -434,6 +434,8 @@
434434
@include type-style('body-2');
435435

436436
--ig-body-2-text-transform: unset;
437+
438+
padding-inline: rem(32px);
437439
}
438440

439441
color: color($color: 'gray', $variant: if($theme-variant == 'light', 600, 900));
@@ -476,7 +478,7 @@
476478
}
477479

478480
%filter-tree__inputs {
479-
--ig-size: #{if($variant == 'indigo', 2, 1)};
481+
--ig-size: #{if($variant == 'indigo' or $variant == 'bootstrap', 2, 1)};
480482

481483
display: flex;
482484
align-items: flex-end;
@@ -504,7 +506,7 @@
504506
}
505507

506508
%filter-tree__inputs-actions {
507-
--ig-size: #{if($variant != 'bootstrap', 2, 1)};
509+
--ig-size: 2;
508510

509511
display: flex;
510512
gap: rem(8px);

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
igxButton="flat"
9898
[disabled]="hasEditedExpression"
9999
(click)="addCondition(expressionItem, afterExpression, true)"
100-
igxDrop
100+
igxDrop
101101
(enter)="onAddConditionEnter(addConditionButton, expressionItem)"
102102
(leave)="onChipLeave()"
103103
>
@@ -151,8 +151,8 @@
151151
[removable]="isInEditMode() ? 'true' : 'false'"
152152
(keydown)="invokeClick($event)"
153153
(click)="onChipClick(expressionItem, expressionChip)"
154-
(remove)="onChipRemove(expressionItem)"
155-
154+
(remove)="onChipRemove(expressionItem)"
155+
156156
>
157157
<igx-icon igxPrefix
158158
class="igx-drag-indicator"
@@ -423,14 +423,14 @@
423423

424424
<div class="igx-filter-tree__inputs-actions">
425425
<button type="button"
426-
igxIconButton="flat"
426+
igxIconButton="outlined"
427427
[disabled]="!operandCanBeCommitted()"
428428
(click)="commitExpression()"
429429
>
430430
<igx-icon family="default" name="confirm"></igx-icon>
431431
</button>
432432
<button type="button"
433-
igxIconButton="flat"
433+
igxIconButton="outlined"
434434
(click)="discardExpression(expressionItem)"
435435
>
436436
<ng-container *ngTemplateOutlet="closeIcon"></ng-container>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1280,7 +1280,7 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
12801280
if (!keyboardMode) {
12811281
var span = document.createElement('span')
12821282
//TODO Localize string
1283-
span.innerHTML = "Drop condition here";
1283+
span.innerHTML = "Drop here to insert";
12841284

12851285
dragCopy.firstChild.firstChild.removeChild(dragCopy.firstChild.firstChild.childNodes[1]);
12861286
dragCopy.firstChild.firstChild.removeChild(dragCopy.firstChild.firstChild.childNodes[1]);

0 commit comments

Comments
 (0)