@syncfusion/ej2-angular-querybuilder 22.1.34 → 22.1.37-ngcc

package/styles/material3.css

@@ -171,21 +171,26 @@
 }
 
 .e-popup.e-ddl:not(.e-ddl-device) .e-input-group .e-clear-icon {
-  margin: 6px 6px 5px;
-  min-height: 12px;
-  min-width: 12px;
-  padding: 6px;
+  margin: 0 6px;
+  min-height: 30px;
+  min-width: 30px;
 }
 
 .e-bigger .e-popup.e-ddl:not(.e-ddl-device) .e-input-group .e-clear-icon,
 .e-bigger.e-popup.e-ddl:not(.e-ddl-device) .e-input-group .e-clear-icon {
-  min-height: 16px;
-  min-width: 16px;
+  min-height: 38px;
+  min-width: 38px;
+}
+
+.e-small .e-popup.e-ddl:not(.e-ddl-device) .e-input-group .e-clear-icon,
+.e-small.e-popup.e-ddl:not(.e-ddl-device) .e-input-group .e-clear-icon {
+  min-height: 22px;
+  min-width: 22px;
 }
 
 .e-bigger .e-popup.e-ddl:not(.e-ddl-device) .e-filter-parent .e-input-filter,
 .e-bigger.e-popup.e-ddl:not(.e-ddl-device) .e-filter-parent .e-input-filter {
-  padding: 8px 16px 8px 0;
+  padding: 4px 16px 4px 0;
 }
 
 .e-input-group.e-ddl,
@@ -205,7 +210,7 @@
 .e-popup.e-ddl:not(.e-ddl-device) .e-input-group.e-input-focus.e-small .e-clear-icon,
 .e-small .e-popup.e-ddl:not(.e-ddl-device) .e-input-group.e-input-focus .e-clear-icon,
 .e-small.e-popup.e-ddl:not(.e-ddl-device) .e-input-group.e-input-focus .e-clear-icon {
-  margin: 0;
+  margin: 4px;
 }
 
 .e-small .e-popup.e-ddl:not(.e-ddl-device) .e-filter-parent .e-input-group .e-input-filter,
@@ -214,7 +219,7 @@
 .e-small .e-popup.e-ddl:not(.e-ddl-device) .e-filter-parent .e-input-group.e-input-focus .e-input-filter,
 .e-small.e-popup.e-ddl:not(.e-ddl-device) .e-filter-parent .e-input-group.e-input-focus .e-input-filter,
 .e-popup.e-ddl:not(.e-ddl-device) .e-filter-parent .e-input-group.e-small.e-input-focus .e-input-filter {
-  padding: 5px 5px 5px 12px;
+  padding: 4px 5px 4px 12px;
 }
 
 .e-bigger.e-small .e-popup.e-ddl:not(.e-ddl-device) .e-input-group .e-clear-icon,
@@ -224,8 +229,8 @@
 .e-small .e-popup.e-ddl:not(.e-ddl-device) .e-input-group.e-bigger .e-clear-icon,
 .e-small.e-popup.e-ddl:not(.e-ddl-device) .e-input-group.e-bigger .e-clear-icon,
 .e-popup.e-ddl:not(.e-ddl-device) .e-input-group.e-bigger.e-small .e-clear-icon {
-  min-height: 18px;
-  min-width: 18px;
+  min-height: 34px;
+  min-width: 34px;
 }
 
 .e-bigger.e-small .e-popup.e-ddl:not(.e-ddl-device) .e-filter-parent .e-input-group .e-input-filter,
@@ -238,6 +243,10 @@
   padding: 8px 16px;
 }
 
+.e-bigger.e-small .e-popup.e-ddl:not(.e-ddl-device) .e-input-group.e-input-focus .e-clear-icon {
+  margin: 0 4px;
+}
+
 .e-ddl.e-popup.e-outline .e-filter-parent {
   padding: 4px 8px;
 }
@@ -276,8 +285,6 @@
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-btn.e-btngroup-and-lbl.e-small.e-not {
   border: 1px solid var(--color-sf-outline);
-  border-bottom-left-radius: 20px;
-  border-top-left-radius: 20px;
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-btn.e-btngroup-and-lbl.e-small.e-readonly-and {
   border-bottom-left-radius: 20px;
@@ -293,9 +300,10 @@
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small {
   border: 1px solid var(--color-sf-outline);
-  border-bottom-left-radius: 20px;
-  border-top-left-radius: 20px;
-  border-top-right-radius: 20px;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
+  border-top-right-radius: 4px;
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small.e-not-readonly {
   border-bottom-right-radius: 20px;
@@ -394,8 +402,8 @@
 .e-query-builder .e-group-header .e-qb-toggle.e-btn.e-small {
   border: 1px solid var(--color-sf-outline);
   border-bottom-right-radius: 20px;
-  border-bottom-left-radius: 20px;
-  border-top-left-radius: 20px;
+  border-bottom-left-radius: 4px;
+  border-top-left-radius: 4px;
   border-top-right-radius: 20px;
 }
 .e-query-builder .e-group-header .e-qb-toggle.e-btn.e-small.e-not-readonly {
@@ -417,6 +425,8 @@
 }
 .e-query-builder .e-group-header .e-btn.e-btngroup-and-lbl.e-small.e-not {
   border: 1px solid var(--color-sf-outline);
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
 }
@@ -429,10 +439,6 @@
 }
 .e-query-builder .e-group-header .e-btn.e-btngroup-or-lbl.e-small {
   border: 1px solid var(--color-sf-outline);
-  border-bottom-right-radius: 20px;
-  border-top-right-radius: 20px;
-  border-bottom-left-radius: 0;
-  border-top-left-radius: 0;
 }
 .e-query-builder .e-group-header .e-btn.e-btngroup-or-lbl.e-small.e-readonly-or-not {
   border-bottom-left-radius: 20px;

package/styles/material3.scss

@@ -1,3 +1,2 @@
 
-@import 'ej2-base/styles/material3-definition.scss';
 @import 'query-builder/material3.scss';

package/styles/query-builder/bootstrap-dark.css

@@ -182,7 +182,7 @@
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
-  border-top-right-radius: 4px;
+  border-top-right-radius: 0;
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small.e-not-readonly {
   border-bottom-right-radius: 4px;

package/styles/query-builder/bootstrap-dark.scss

@@ -1,15 +1 @@
-@import 'ej2-base/styles/bootstrap-dark-definition.scss';
-@import 'ej2-buttons/styles/button/bootstrap-dark-definition.scss';
-@import 'ej2-buttons/styles/radio-button/bootstrap-dark-definition.scss';
-@import 'ej2-splitbuttons/styles/button-group/bootstrap-dark-definition.scss';
-@import 'ej2-splitbuttons/styles/drop-down-button/bootstrap-dark-definition.scss';
-@import 'ej2-dropdowns/styles/drop-down-list/bootstrap-dark-definition.scss';
-@import 'ej2-dropdowns/styles/multi-select/bootstrap-dark-definition.scss';
-@import 'ej2-calendars/styles/datepicker/bootstrap-dark-definition.scss';
-@import 'ej2-inputs/styles/numerictextbox/bootstrap-dark-definition.scss';
-@import 'ej2-inputs/styles/textbox/bootstrap-dark-definition.scss';
-@import 'ej2-popups/styles/tooltip/bootstrap-dark-definition.scss';
-@import 'ej2-popups/styles/spinner/bootstrap-dark-definition.scss';
-@import 'bootstrap-dark-definition.scss';
-@import 'icons/bootstrap-dark.scss';
-@import 'all.scss';
+@import 'ej2-querybuilder/styles/query-builder/bootstrap-dark.scss';

package/styles/query-builder/bootstrap.css

@@ -180,7 +180,7 @@
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
-  border-top-right-radius: 4px;
+  border-top-right-radius: 0;
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small.e-not-readonly {
   border-bottom-right-radius: 4px;

package/styles/query-builder/bootstrap.scss

@@ -1,15 +1 @@
-@import 'ej2-base/styles/bootstrap-definition.scss';
-@import 'ej2-buttons/styles/button/bootstrap-definition.scss';
-@import 'ej2-buttons/styles/radio-button/bootstrap-definition.scss';
-@import 'ej2-splitbuttons/styles/button-group/bootstrap-definition.scss';
-@import 'ej2-splitbuttons/styles/drop-down-button/bootstrap-definition.scss';
-@import 'ej2-dropdowns/styles/drop-down-list/bootstrap-definition.scss';
-@import 'ej2-dropdowns/styles/multi-select/bootstrap-definition.scss';
-@import 'ej2-calendars/styles/datepicker/bootstrap-definition.scss';
-@import 'ej2-inputs/styles/numerictextbox/bootstrap-definition.scss';
-@import 'ej2-inputs/styles/textbox/bootstrap-definition.scss';
-@import 'ej2-popups/styles/tooltip/bootstrap-definition.scss';
-@import 'ej2-popups/styles/spinner/bootstrap-definition.scss';
-@import 'bootstrap-definition.scss';
-@import 'icons/bootstrap.scss';
-@import 'all.scss';
+@import 'ej2-querybuilder/styles/query-builder/bootstrap.scss';

package/styles/query-builder/bootstrap4.css

@@ -260,7 +260,7 @@
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
-  border-top-right-radius: 4px;
+  border-top-right-radius: 0;
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small.e-not-readonly {
   border-bottom-right-radius: 4px;

package/styles/query-builder/bootstrap4.scss

@@ -1,15 +1 @@
-@import 'ej2-base/styles/bootstrap4-definition.scss';
-@import 'ej2-buttons/styles/button/bootstrap4-definition.scss';
-@import 'ej2-buttons/styles/radio-button/bootstrap4-definition.scss';
-@import 'ej2-splitbuttons/styles/button-group/bootstrap4-definition.scss';
-@import 'ej2-splitbuttons/styles/drop-down-button/bootstrap4-definition.scss';
-@import 'ej2-dropdowns/styles/drop-down-list/bootstrap4-definition.scss';
-@import 'ej2-dropdowns/styles/multi-select/bootstrap4-definition.scss';
-@import 'ej2-calendars/styles/datepicker/bootstrap4-definition.scss';
-@import 'ej2-inputs/styles/numerictextbox/bootstrap4-definition.scss';
-@import 'ej2-inputs/styles/textbox/bootstrap4-definition.scss';
-@import 'ej2-popups/styles/tooltip/bootstrap4-definition.scss';
-@import 'ej2-popups/styles/spinner/bootstrap4-definition.scss';
-@import 'bootstrap4-definition.scss';
-@import 'icons/bootstrap4.scss';
-@import 'all.scss';
+@import 'ej2-querybuilder/styles/query-builder/bootstrap4.scss';

package/styles/query-builder/bootstrap5-dark.css

@@ -230,7 +230,7 @@
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
-  border-top-right-radius: 4px;
+  border-top-right-radius: 0;
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small.e-not-readonly {
   border-bottom-right-radius: 4px;

package/styles/query-builder/bootstrap5-dark.scss

@@ -1,15 +1 @@
-@import 'ej2-base/styles/bootstrap5-dark-definition.scss';
-@import 'ej2-buttons/styles/button/bootstrap5-dark-definition.scss';
-@import 'ej2-buttons/styles/radio-button/bootstrap5-dark-definition.scss';
-@import 'ej2-splitbuttons/styles/button-group/bootstrap5-dark-definition.scss';
-@import 'ej2-splitbuttons/styles/drop-down-button/bootstrap5-dark-definition.scss';
-@import 'ej2-dropdowns/styles/drop-down-list/bootstrap5-dark-definition.scss';
-@import 'ej2-dropdowns/styles/multi-select/bootstrap5-dark-definition.scss';
-@import 'ej2-calendars/styles/datepicker/bootstrap5-dark-definition.scss';
-@import 'ej2-inputs/styles/numerictextbox/bootstrap5-dark-definition.scss';
-@import 'ej2-inputs/styles/textbox/bootstrap5-dark-definition.scss';
-@import 'ej2-popups/styles/tooltip/bootstrap5-dark-definition.scss';
-@import 'ej2-popups/styles/spinner/bootstrap5-dark-definition.scss';
-@import 'bootstrap5-dark-definition.scss';
-@import 'icons/bootstrap5-dark.scss';
-@import 'all.scss';
+@import 'ej2-querybuilder/styles/query-builder/bootstrap5-dark.scss';

package/styles/query-builder/bootstrap5.css

@@ -230,7 +230,7 @@
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
-  border-top-right-radius: 4px;
+  border-top-right-radius: 0;
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small.e-not-readonly {
   border-bottom-right-radius: 4px;

package/styles/query-builder/bootstrap5.scss

@@ -1,15 +1 @@
-@import 'ej2-base/styles/bootstrap5-definition.scss';
-@import 'ej2-buttons/styles/button/bootstrap5-definition.scss';
-@import 'ej2-buttons/styles/radio-button/bootstrap5-definition.scss';
-@import 'ej2-splitbuttons/styles/button-group/bootstrap5-definition.scss';
-@import 'ej2-splitbuttons/styles/drop-down-button/bootstrap5-definition.scss';
-@import 'ej2-dropdowns/styles/drop-down-list/bootstrap5-definition.scss';
-@import 'ej2-dropdowns/styles/multi-select/bootstrap5-definition.scss';
-@import 'ej2-calendars/styles/datepicker/bootstrap5-definition.scss';
-@import 'ej2-inputs/styles/numerictextbox/bootstrap5-definition.scss';
-@import 'ej2-inputs/styles/textbox/bootstrap5-definition.scss';
-@import 'ej2-popups/styles/tooltip/bootstrap5-definition.scss';
-@import 'ej2-popups/styles/spinner/bootstrap5-definition.scss';
-@import 'bootstrap5-definition.scss';
-@import 'icons/bootstrap5.scss';
-@import 'all.scss';
+@import 'ej2-querybuilder/styles/query-builder/bootstrap5.scss';

package/styles/query-builder/fabric-dark.scss

@@ -1,15 +1 @@
-@import 'ej2-base/styles/fabric-dark-definition.scss';
-@import 'ej2-buttons/styles/button/fabric-dark-definition.scss';
-@import 'ej2-buttons/styles/radio-button/fabric-dark-definition.scss';
-@import 'ej2-splitbuttons/styles/button-group/fabric-dark-definition.scss';
-@import 'ej2-splitbuttons/styles/drop-down-button/fabric-dark-definition.scss';
-@import 'ej2-dropdowns/styles/drop-down-list/fabric-dark-definition.scss';
-@import 'ej2-dropdowns/styles/multi-select/fabric-dark-definition.scss';
-@import 'ej2-calendars/styles/datepicker/fabric-dark-definition.scss';
-@import 'ej2-inputs/styles/numerictextbox/fabric-dark-definition.scss';
-@import 'ej2-inputs/styles/textbox/fabric-dark-definition.scss';
-@import 'ej2-popups/styles/tooltip/fabric-dark-definition.scss';
-@import 'ej2-popups/styles/spinner/fabric-dark-definition.scss';
-@import 'fabric-dark-definition.scss';
-@import 'icons/fabric-dark.scss';
-@import 'all.scss';
+@import 'ej2-querybuilder/styles/query-builder/fabric-dark.scss';

package/styles/query-builder/fabric.scss

@@ -1,15 +1 @@
-@import 'ej2-base/styles/fabric-definition.scss';
-@import 'ej2-buttons/styles/button/fabric-definition.scss';
-@import 'ej2-buttons/styles/radio-button/fabric-definition.scss';
-@import 'ej2-splitbuttons/styles/button-group/fabric-definition.scss';
-@import 'ej2-splitbuttons/styles/drop-down-button/fabric-definition.scss';
-@import 'ej2-dropdowns/styles/drop-down-list/fabric-definition.scss';
-@import 'ej2-dropdowns/styles/multi-select/fabric-definition.scss';
-@import 'ej2-calendars/styles/datepicker/fabric-definition.scss';
-@import 'ej2-inputs/styles/numerictextbox/fabric-definition.scss';
-@import 'ej2-inputs/styles/textbox/fabric-definition.scss';
-@import 'ej2-popups/styles/tooltip/fabric-definition.scss';
-@import 'ej2-popups/styles/spinner/fabric-definition.scss';
-@import 'fabric-definition.scss';
-@import 'icons/fabric.scss';
-@import 'all.scss';
+@import 'ej2-querybuilder/styles/query-builder/fabric.scss';

package/styles/query-builder/fluent-dark.css

@@ -210,7 +210,7 @@
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
-  border-top-right-radius: 4px;
+  border-top-right-radius: 0;
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small.e-not-readonly {
   border-bottom-right-radius: 4px;

package/styles/query-builder/fluent-dark.scss

@@ -1,15 +1 @@
-@import 'ej2-base/styles/fluent-dark-definition.scss';
-@import 'ej2-buttons/styles/button/fluent-dark-definition.scss';
-@import 'ej2-buttons/styles/radio-button/fluent-dark-definition.scss';
-@import 'ej2-splitbuttons/styles/button-group/fluent-dark-definition.scss';
-@import 'ej2-splitbuttons/styles/drop-down-button/fluent-dark-definition.scss';
-@import 'ej2-dropdowns/styles/drop-down-list/fluent-dark-definition.scss';
-@import 'ej2-dropdowns/styles/multi-select/fluent-dark-definition.scss';
-@import 'ej2-calendars/styles/datepicker/fluent-dark-definition.scss';
-@import 'ej2-inputs/styles/numerictextbox/fluent-dark-definition.scss';
-@import 'ej2-inputs/styles/textbox/fluent-dark-definition.scss';
-@import 'ej2-popups/styles/tooltip/fluent-dark-definition.scss';
-@import 'ej2-popups/styles/spinner/fluent-dark-definition.scss';
-@import 'fluent-dark-definition.scss';
-@import 'icons/fluent-dark.scss';
-@import 'all.scss';
+@import 'ej2-querybuilder/styles/query-builder/fluent-dark.scss';

package/styles/query-builder/fluent.css

@@ -210,7 +210,7 @@
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
-  border-top-right-radius: 4px;
+  border-top-right-radius: 0;
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small.e-not-readonly {
   border-bottom-right-radius: 4px;

package/styles/query-builder/fluent.scss

@@ -1,15 +1 @@
-@import 'ej2-base/styles/fluent-definition.scss';
-@import 'ej2-buttons/styles/button/fluent-definition.scss';
-@import 'ej2-buttons/styles/radio-button/fluent-definition.scss';
-@import 'ej2-splitbuttons/styles/button-group/fluent-definition.scss';
-@import 'ej2-splitbuttons/styles/drop-down-button/fluent-definition.scss';
-@import 'ej2-dropdowns/styles/drop-down-list/fluent-definition.scss';
-@import 'ej2-dropdowns/styles/multi-select/fluent-definition.scss';
-@import 'ej2-calendars/styles/datepicker/fluent-definition.scss';
-@import 'ej2-inputs/styles/numerictextbox/fluent-definition.scss';
-@import 'ej2-inputs/styles/textbox/fluent-definition.scss';
-@import 'ej2-popups/styles/tooltip/fluent-definition.scss';
-@import 'ej2-popups/styles/spinner/fluent-definition.scss';
-@import 'fluent-definition.scss';
-@import 'icons/fluent.scss';
-@import 'all.scss';
+@import 'ej2-querybuilder/styles/query-builder/fluent.scss';

package/styles/query-builder/highcontrast-light.scss

@@ -1,15 +1 @@
-@import 'ej2-base/styles/highcontrast-light-definition.scss';
-@import 'ej2-buttons/styles/button/highcontrast-light-definition.scss';
-@import 'ej2-buttons/styles/radio-button/highcontrast-light-definition.scss';
-@import 'ej2-splitbuttons/styles/button-group/highcontrast-light-definition.scss';
-@import 'ej2-splitbuttons/styles/drop-down-button/highcontrast-light-definition.scss';
-@import 'ej2-dropdowns/styles/drop-down-list/highcontrast-light-definition.scss';
-@import 'ej2-dropdowns/styles/multi-select/highcontrast-light-definition.scss';
-@import 'ej2-calendars/styles/datepicker/highcontrast-light-definition.scss';
-@import 'ej2-inputs/styles/numerictextbox/highcontrast-light-definition.scss';
-@import 'ej2-inputs/styles/textbox/highcontrast-light-definition.scss';
-@import 'ej2-popups/styles/tooltip/highcontrast-light-definition.scss';
-@import 'ej2-popups/styles/spinner/highcontrast-light-definition.scss';
-@import 'highcontrast-light-definition.scss';
-@import 'icons/highcontrast-light.scss';
-@import 'all.scss';
+@import 'ej2-querybuilder/styles/query-builder/highcontrast-light.scss';

package/styles/query-builder/highcontrast.scss

@@ -1,15 +1 @@
-@import 'ej2-base/styles/highcontrast-definition.scss';
-@import 'ej2-buttons/styles/button/highcontrast-definition.scss';
-@import 'ej2-buttons/styles/radio-button/highcontrast-definition.scss';
-@import 'ej2-splitbuttons/styles/button-group/highcontrast-definition.scss';
-@import 'ej2-splitbuttons/styles/drop-down-button/highcontrast-definition.scss';
-@import 'ej2-dropdowns/styles/drop-down-list/highcontrast-definition.scss';
-@import 'ej2-dropdowns/styles/multi-select/highcontrast-definition.scss';
-@import 'ej2-calendars/styles/datepicker/highcontrast-definition.scss';
-@import 'ej2-inputs/styles/numerictextbox/highcontrast-definition.scss';
-@import 'ej2-inputs/styles/textbox/highcontrast-definition.scss';
-@import 'ej2-popups/styles/tooltip/highcontrast-definition.scss';
-@import 'ej2-popups/styles/spinner/highcontrast-definition.scss';
-@import 'highcontrast-definition.scss';
-@import 'icons/highcontrast.scss';
-@import 'all.scss';
+@import 'ej2-querybuilder/styles/query-builder/highcontrast.scss';

package/styles/query-builder/material-dark.css

@@ -156,7 +156,7 @@
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
-  border-top-right-radius: 2px;
+  border-top-right-radius: 0;
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small.e-not-readonly {
   border-bottom-right-radius: 2px;

package/styles/query-builder/material-dark.scss

@@ -1,15 +1 @@
-@import 'ej2-base/styles/material-dark-definition.scss';
-@import 'ej2-buttons/styles/button/material-dark-definition.scss';
-@import 'ej2-buttons/styles/radio-button/material-dark-definition.scss';
-@import 'ej2-splitbuttons/styles/button-group/material-dark-definition.scss';
-@import 'ej2-splitbuttons/styles/drop-down-button/material-dark-definition.scss';
-@import 'ej2-dropdowns/styles/drop-down-list/material-dark-definition.scss';
-@import 'ej2-dropdowns/styles/multi-select/material-dark-definition.scss';
-@import 'ej2-calendars/styles/datepicker/material-dark-definition.scss';
-@import 'ej2-inputs/styles/numerictextbox/material-dark-definition.scss';
-@import 'ej2-inputs/styles/textbox/material-dark-definition.scss';
-@import 'ej2-popups/styles/tooltip/material-dark-definition.scss';
-@import 'ej2-popups/styles/spinner/material-dark-definition.scss';
-@import 'material-dark-definition.scss';
-@import 'icons/material-dark.scss';
-@import 'all.scss';
+@import 'ej2-querybuilder/styles/query-builder/material-dark.scss';

package/styles/query-builder/material.css

@@ -181,7 +181,7 @@
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
-  border-top-right-radius: 2px;
+  border-top-right-radius: 0;
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small.e-not-readonly {
   border-bottom-right-radius: 2px;

package/styles/query-builder/material.scss

@@ -1,15 +1 @@
-@import 'ej2-base/styles/material-definition.scss';
-@import 'ej2-buttons/styles/button/material-definition.scss';
-@import 'ej2-buttons/styles/radio-button/material-definition.scss';
-@import 'ej2-splitbuttons/styles/button-group/material-definition.scss';
-@import 'ej2-splitbuttons/styles/drop-down-button/material-definition.scss';
-@import 'ej2-dropdowns/styles/drop-down-list/material-definition.scss';
-@import 'ej2-dropdowns/styles/multi-select/material-definition.scss';
-@import 'ej2-calendars/styles/datepicker/material-definition.scss';
-@import 'ej2-inputs/styles/numerictextbox/material-definition.scss';
-@import 'ej2-inputs/styles/textbox/material-definition.scss';
-@import 'ej2-popups/styles/tooltip/material-definition.scss';
-@import 'ej2-popups/styles/spinner/material-definition.scss';
-@import 'material-definition.scss';
-@import 'icons/material.scss';
-@import 'all.scss';
+@import 'ej2-querybuilder/styles/query-builder/material.scss';

package/styles/query-builder/material3-dark.css

@@ -115,21 +115,26 @@
 }
 
 .e-popup.e-ddl:not(.e-ddl-device) .e-input-group .e-clear-icon {
-  margin: 6px 6px 5px;
-  min-height: 12px;
-  min-width: 12px;
-  padding: 6px;
+  margin: 0 6px;
+  min-height: 30px;
+  min-width: 30px;
 }
 
 .e-bigger .e-popup.e-ddl:not(.e-ddl-device) .e-input-group .e-clear-icon,
 .e-bigger.e-popup.e-ddl:not(.e-ddl-device) .e-input-group .e-clear-icon {
-  min-height: 16px;
-  min-width: 16px;
+  min-height: 38px;
+  min-width: 38px;
+}
+
+.e-small .e-popup.e-ddl:not(.e-ddl-device) .e-input-group .e-clear-icon,
+.e-small.e-popup.e-ddl:not(.e-ddl-device) .e-input-group .e-clear-icon {
+  min-height: 22px;
+  min-width: 22px;
 }
 
 .e-bigger .e-popup.e-ddl:not(.e-ddl-device) .e-filter-parent .e-input-filter,
 .e-bigger.e-popup.e-ddl:not(.e-ddl-device) .e-filter-parent .e-input-filter {
-  padding: 8px 16px 8px 0;
+  padding: 4px 16px 4px 0;
 }
 
 .e-input-group.e-ddl,
@@ -149,7 +154,7 @@
 .e-popup.e-ddl:not(.e-ddl-device) .e-input-group.e-input-focus.e-small .e-clear-icon,
 .e-small .e-popup.e-ddl:not(.e-ddl-device) .e-input-group.e-input-focus .e-clear-icon,
 .e-small.e-popup.e-ddl:not(.e-ddl-device) .e-input-group.e-input-focus .e-clear-icon {
-  margin: 0;
+  margin: 4px;
 }
 
 .e-small .e-popup.e-ddl:not(.e-ddl-device) .e-filter-parent .e-input-group .e-input-filter,
@@ -158,7 +163,7 @@
 .e-small .e-popup.e-ddl:not(.e-ddl-device) .e-filter-parent .e-input-group.e-input-focus .e-input-filter,
 .e-small.e-popup.e-ddl:not(.e-ddl-device) .e-filter-parent .e-input-group.e-input-focus .e-input-filter,
 .e-popup.e-ddl:not(.e-ddl-device) .e-filter-parent .e-input-group.e-small.e-input-focus .e-input-filter {
-  padding: 5px 5px 5px 12px;
+  padding: 4px 5px 4px 12px;
 }
 
 .e-bigger.e-small .e-popup.e-ddl:not(.e-ddl-device) .e-input-group .e-clear-icon,
@@ -168,8 +173,8 @@
 .e-small .e-popup.e-ddl:not(.e-ddl-device) .e-input-group.e-bigger .e-clear-icon,
 .e-small.e-popup.e-ddl:not(.e-ddl-device) .e-input-group.e-bigger .e-clear-icon,
 .e-popup.e-ddl:not(.e-ddl-device) .e-input-group.e-bigger.e-small .e-clear-icon {
-  min-height: 18px;
-  min-width: 18px;
+  min-height: 34px;
+  min-width: 34px;
 }
 
 .e-bigger.e-small .e-popup.e-ddl:not(.e-ddl-device) .e-filter-parent .e-input-group .e-input-filter,
@@ -182,6 +187,10 @@
   padding: 8px 16px;
 }
 
+.e-bigger.e-small .e-popup.e-ddl:not(.e-ddl-device) .e-input-group.e-input-focus .e-clear-icon {
+  margin: 0 4px;
+}
+
 .e-ddl.e-popup.e-outline .e-filter-parent {
   padding: 4px 8px;
 }
@@ -220,8 +229,6 @@
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-btn.e-btngroup-and-lbl.e-small.e-not {
   border: 1px solid var(--color-sf-outline);
-  border-bottom-left-radius: 20px;
-  border-top-left-radius: 20px;
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-btn.e-btngroup-and-lbl.e-small.e-readonly-and {
   border-bottom-left-radius: 20px;
@@ -237,9 +244,10 @@
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small {
   border: 1px solid var(--color-sf-outline);
-  border-bottom-left-radius: 20px;
-  border-top-left-radius: 20px;
-  border-top-right-radius: 20px;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
+  border-top-right-radius: 4px;
 }
 .e-query-builder.e-rtl .e-btn-group.e-rtl .e-qb-toggle.e-btn.e-small.e-not-readonly {
   border-bottom-right-radius: 20px;
@@ -338,8 +346,8 @@
 .e-query-builder .e-group-header .e-qb-toggle.e-btn.e-small {
   border: 1px solid var(--color-sf-outline);
   border-bottom-right-radius: 20px;
-  border-bottom-left-radius: 20px;
-  border-top-left-radius: 20px;
+  border-bottom-left-radius: 4px;
+  border-top-left-radius: 4px;
   border-top-right-radius: 20px;
 }
 .e-query-builder .e-group-header .e-qb-toggle.e-btn.e-small.e-not-readonly {
@@ -361,6 +369,8 @@
 }
 .e-query-builder .e-group-header .e-btn.e-btngroup-and-lbl.e-small.e-not {
   border: 1px solid var(--color-sf-outline);
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
 }
@@ -373,10 +383,6 @@
 }
 .e-query-builder .e-group-header .e-btn.e-btngroup-or-lbl.e-small {
   border: 1px solid var(--color-sf-outline);
-  border-bottom-right-radius: 20px;
-  border-top-right-radius: 20px;
-  border-bottom-left-radius: 0;
-  border-top-left-radius: 0;
 }
 .e-query-builder .e-group-header .e-btn.e-btngroup-or-lbl.e-small.e-readonly-or-not {
   border-bottom-left-radius: 20px;

package/styles/query-builder/material3-dark.scss

@@ -1,16 +1,2 @@
 @import 'ej2-base/styles/material3-dark-definition.scss';
-
-@import 'ej2-buttons/styles/button/material3-dark-definition.scss';
-@import 'ej2-buttons/styles/radio-button/material3-dark-definition.scss';
-@import 'ej2-splitbuttons/styles/button-group/material3-dark-definition.scss';
-@import 'ej2-splitbuttons/styles/drop-down-button/material3-dark-definition.scss';
-@import 'ej2-dropdowns/styles/drop-down-list/material3-dark-definition.scss';
-@import 'ej2-dropdowns/styles/multi-select/material3-dark-definition.scss';
-@import 'ej2-calendars/styles/datepicker/material3-dark-definition.scss';
-@import 'ej2-inputs/styles/numerictextbox/material3-dark-definition.scss';
-@import 'ej2-inputs/styles/textbox/material3-dark-definition.scss';
-@import 'ej2-popups/styles/tooltip/material3-dark-definition.scss';
-@import 'ej2-popups/styles/spinner/material3-dark-definition.scss';
-@import 'material3-dark-definition.scss';
-@import 'icons/material3-dark.scss';
-@import 'all.scss';
+@import 'ej2-querybuilder/styles/query-builder/material3-dark.scss';