Skip to content

Commit a912c19

Browse files
Merge branch 'master' into ganastasov/align-agents-md-with-repo-workflow
2 parents 19bf75e + e8c2259 commit a912c19

9 files changed

Lines changed: 48 additions & 27 deletions

File tree

angular.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,9 @@
208208
"exclude": [
209209
"migrations",
210210
"schematics"
211+
],
212+
"codeCoverageExclude": [
213+
"projects/igniteui-angular/test-utils/**"
211214
]
212215
}
213216
},

package-lock.json

Lines changed: 29 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"express": "^5.2.1",
8383
"fflate": "^0.8.1",
8484
"igniteui-i18n-core": "^1.0.2",
85-
"igniteui-theming": "^25.0.0",
85+
"igniteui-theming": "^25.0.3",
8686
"igniteui-trial-watermark": "^3.1.0",
8787
"jspdf": "^4.2.1",
8888
"lodash-es": "^4.17.21",

projects/igniteui-angular-elements/src/public_api.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { registerI18n, setCurrentI18n } from 'igniteui-i18n-core';
2-
import { ByLevelTreeGridMergeStrategy, ColumnPinningPosition, DefaultMergeStrategy, DefaultTreeGridMergeStrategy, FilteringExpressionsTree, FilteringExpressionsTreeType, FilteringLogic, HorizontalAlignment, IgxBooleanFilteringOperand, IgxDateFilteringOperand, IgxDateTimeFilteringOperand, IgxFilteringOperand, IgxNumberFilteringOperand, IgxStringFilteringOperand, IgxTimeFilteringOperand, NoopFilteringStrategy, NoopSortingStrategy, SortingDirection, VerticalAlignment } from 'igniteui-angular/core';
2+
import { ByLevelTreeGridMergeStrategy, ColumnPinningPosition, DefaultMergeStrategy, DefaultTreeGridMergeStrategy, FilteringExpressionsTree, FilteringExpressionsTreeType, FilteringLogic, HorizontalAlignment, IgxBooleanFilteringOperand, IgxDateFilteringOperand, IgxDateTimeFilteringOperand, IgxFilteringOperand, IgxNumberFilteringOperand, IgxStringFilteringOperand, IgxTimeFilteringOperand, NoopFilteringStrategy, NoopSortingStrategy, SortingDirection, TransactionType, TransactionEventOrigin, VerticalAlignment } from 'igniteui-angular/core';
33
import { DropPosition, GridPagingMode, IgxDateSummaryOperand, IgxNumberSummaryOperand, IgxPivotAggregate, IgxPivotDateAggregate, IgxPivotDateDimension, IgxPivotNumericAggregate, IgxPivotTimeAggregate, IgxSummaryOperand, IgxTimeSummaryOperand, NoopPivotDimensionsStrategy, PivotDimensionType, RowPinningPosition } from 'igniteui-angular/grids/core';
44

55
/** Export Public API, TODO: reorganize, Generate all w/ renames? */
@@ -49,4 +49,8 @@ export {
4949
// i18n
5050
registerI18n,
5151
setCurrentI18n,
52+
53+
// Transactions API
54+
TransactionType,
55+
TransactionEventOrigin,
5256
}

projects/igniteui-angular/core/src/core/styles/components/checkbox/_checkbox-theme.scss

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -175,15 +175,8 @@
175175
}
176176

177177
%cbx-composite--x--disabled {
178-
@if $variant == 'material' or $variant == 'fluent' {
179-
background: var-get($theme, 'disabled-color');
180-
border-color: var-get($theme, 'disabled-color');
181-
}
182-
183-
@if $variant == 'indigo' or $variant == 'bootstrap' {
184-
background: var-get($theme, 'disabled-indeterminate-color');
185-
border-color: transparent;
186-
}
178+
background: var-get($theme, 'disabled-fill-color');
179+
border-color: transparent;
187180

188181
@if $variant != 'indigo' {
189182
%cbx-composite-mark {
@@ -267,6 +260,8 @@
267260
%igx-checkbox--disabled-indeterminate-indigo {
268261
@extend %cbx-composite--x--disabled;
269262

263+
background: var-get($theme, 'disabled-indeterminate-color');
264+
270265
%cbx-composite-mark {
271266
rect {
272267
fill: var-get($theme, 'disabled-tick-color');
@@ -310,17 +305,17 @@
310305
}
311306

312307
%cbx-composite--x--disabled {
313-
border-color: var-get($theme, 'disabled-color');
308+
border-color: var-get($theme, 'disabled-indeterminate-color');
314309

315310
&::before {
316-
background: var-get($theme, 'disabled-color');
311+
background: var-get($theme, 'disabled-indeterminate-color');
317312
}
318313
}
319314
}
320315

321316
%igx-checkbox--disabled-indeterminate {
322317
%cbx-composite--x--disabled {
323-
border-color: var-get($theme, 'disabled-indeterminate-color');
318+
border-color: transparent;
324319
background: var-get($theme, 'disabled-indeterminate-color');
325320
}
326321
}

projects/igniteui-angular/core/src/public_api.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ export * from './data-operations/pipes';
4141
// Services
4242
export * from './services/public_api';
4343

44-
// Performance service
45-
export * from './performance.service';
46-
4744
// i18n
4845
export { setCurrentI18n } from 'igniteui-i18n-core';
4946
export { IResourceStrings, changei18n, registerI18n } from './core/i18n/resources';

projects/igniteui-angular/grids/grid/src/grid-base.directive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2841,7 +2841,7 @@ export abstract class IgxGridBaseDirective implements GridType,
28412841
}
28422842
}
28432843

2844-
/* blazorSuppress */
2844+
/* csSuppress */
28452845
/**
28462846
* Get transactions service for the grid.
28472847
*/

projects/igniteui-angular/karma.conf.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ module.exports = function (config) {
3434
reporters: [
3535
// reporters not supporting the `file` property
3636
{ type: 'lcov' },
37+
{ type: 'text-summary' }
3738
]
3839
},
39-
reporters: ['spec'],
40+
reporters: ['spec', 'coverage'],
4041
specReporter: {
4142
suppressSkipped: true
4243
},

projects/igniteui-angular/core/src/performance.service.ts renamed to projects/igniteui-angular/test-utils/performance.service.ts

File renamed without changes.

0 commit comments

Comments
 (0)