Skip to content

Commit 446c44a

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Merge from base.
2 parents d7a8df6 + c02dfeb commit 446c44a

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_toast.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,11 @@ $_dark-fluent-toast: extend($_fluent-toast);
2323
/// @type {Map}
2424
/// @requires {function} extend
2525
/// @requires $_bootstrap-toast
26-
$_dark-bootstrap-toast: extend($_bootstrap-toast);
26+
$_dark-bootstrap-toast: extend(
27+
$_bootstrap-toast, (
28+
text-color: (
29+
igx-contrast-color: ('grays', 600)
30+
)
31+
)
32+
);
2733

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4065,7 +4065,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
40654065
* @param rowID The row id - primaryKey value or the data record instance.
40664066
* @param index The index at which to insert the row in the pinned collection.
40674067
*/
4068-
public pinRow(rowID, index?): boolean {
4068+
public pinRow(rowID: any, index?: number): boolean {
40694069
if (this._pinnedRecordIDs.indexOf(rowID) !== -1) {
40704070
return false;
40714071
}
@@ -4098,7 +4098,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
40984098
* ```
40994099
* @param rowID The row id - primaryKey value or the data record instance.
41004100
*/
4101-
public unpinRow(rowID) {
4101+
public unpinRow(rowID: any) {
41024102
const index = this._pinnedRecordIDs.indexOf(rowID);
41034103
if (index === -1) {
41044104
return false;

projects/igniteui-angular/src/lib/grids/grid/grid.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,
826826
/**
827827
* @hidden @internal
828828
*/
829-
public getContext(rowData, rowIndex, pinned?): any {
829+
public getContext(rowData: any, rowIndex: number, pinned?: boolean): any {
830830
if (pinned && !this.isRowPinningToTop) {
831831
rowIndex = rowIndex + this.dataView.length;
832832
}

0 commit comments

Comments
 (0)