Skip to content

Commit 65d8999

Browse files
simeonoffsimeonoff
authored
Merge branch 'master' into mpopov/fix-10372
2 parents 5328ad4 + 13d82c1 commit 65d8999

File tree

8 files changed

+1589
-1609
lines changed

8 files changed

+1589
-1609
lines changed

‎package-lock.json

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

‎package.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@
4949
},
5050
"private": true,
5151
"dependencies": {
52-
"@angular/animations": "^13.0.0",
53-
"@angular/common": "^13.0.0",
54-
"@angular/compiler": "^13.0.0",
55-
"@angular/core": "^13.0.0",
56-
"@angular/forms": "^13.0.0",
57-
"@angular/platform-browser": "^13.0.0",
58-
"@angular/platform-browser-dynamic": "^13.0.0",
59-
"@angular/router": "^13.0.0",
52+
"@angular/animations": "^13.0.2",
53+
"@angular/common": "^13.0.2",
54+
"@angular/compiler": "^13.0.2",
55+
"@angular/core": "^13.0.2",
56+
"@angular/forms": "^13.0.2",
57+
"@angular/platform-browser": "^13.0.2",
58+
"@angular/platform-browser-dynamic": "^13.0.2",
59+
"@angular/router": "^13.0.2",
6060
"@igniteui/material-icons-extended": "^2.10.0",
6161
"@types/hammerjs": "^2.0.40",
6262
"@types/source-map": "0.5.2",
@@ -73,28 +73,28 @@
7373
"zone.js": "~0.11.4"
7474
},
7575
"devDependencies": {
76-
"@angular-devkit/build-angular": "~13.0.1",
77-
"@angular-devkit/schematics": "^13.0.1",
78-
"@angular-eslint/builder": "^13.0.0-alpha.0",
79-
"@angular-eslint/eslint-plugin": "^12.6.1",
80-
"@angular-eslint/eslint-plugin-template": "^12.6.1",
81-
"@angular-eslint/schematics": "^12.6.1",
82-
"@angular-eslint/template-parser": "^12.6.1",
83-
"@angular/cli": "~13.0.1",
84-
"@angular/compiler-cli": "^13.0.0",
85-
"@angular/language-service": "^13.0.0",
76+
"@angular-devkit/build-angular": "~13.0.3",
77+
"@angular-devkit/schematics": "^13.0.3",
78+
"@angular-eslint/builder": "^13.0.1",
79+
"@angular-eslint/eslint-plugin": "^13.0.1",
80+
"@angular-eslint/eslint-plugin-template": "^13.0.1",
81+
"@angular-eslint/schematics": "^13.0.1",
82+
"@angular-eslint/template-parser": "^13.0.1",
83+
"@angular/cli": "~13.0.3",
84+
"@angular/compiler-cli": "^13.0.2",
85+
"@angular/language-service": "^13.0.2",
8686
"@angularclass/hmr": "^2.1.3",
8787
"@types/jasmine": "^3.10.2",
8888
"@types/jasminewd2": "^2.0.10",
8989
"@types/node": "^12.20.36",
9090
"@types/webpack-env": "^1.16.3",
91-
"@typescript-eslint/eslint-plugin": "4.16.1",
92-
"@typescript-eslint/parser": "4.16.1",
91+
"@typescript-eslint/eslint-plugin": "5.3.0",
92+
"@typescript-eslint/parser": "5.3.0",
9393
"browser-sync": "^2.27.7",
9494
"codelyzer": "^6.0.2",
9595
"coveralls": "^3.1.1",
96-
"eslint": "^7.32.0",
97-
"eslint-plugin-import": "2.22.1",
96+
"eslint": "^8.2.0",
97+
"eslint-plugin-import": "2.25.2",
9898
"eslint-plugin-jsdoc": "30.7.6",
9999
"eslint-plugin-prefer-arrow": "1.2.2",
100100
"gulp": "^4.0.2",

‎projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

Lines changed: 60 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,6 +1023,7 @@
10231023
border-bottom: 1px solid var-get($theme, 'row-border-color');
10241024
outline-style: none;
10251025
position: relative;
1026+
background-clip: content-box !important;
10261027

10271028
&:hover {
10281029
background: var-get($theme, 'row-hover-background');
@@ -1106,35 +1107,6 @@
11061107
color: var-get($theme, 'row-even-text-color');
11071108
}
11081109

1109-
%grid-row--selected {
1110-
color: var-get($theme, 'row-selected-text-color');
1111-
background: var-get($theme, 'row-selected-background');
1112-
1113-
%grid-cell--selected,
1114-
%grid-cell--pinned-selected {
1115-
color: var-get($theme, 'cell-selected-within-text-color');
1116-
background: var-get($theme, 'cell-selected-within-background');
1117-
}
1118-
1119-
&:hover {
1120-
background: var-get($theme, 'row-selected-hover-background');
1121-
color: var-get($theme, 'row-selected-hover-text-color');
1122-
1123-
%grid-cell--column-selected {
1124-
color: var-get($theme, 'row-selected-hover-text-color');
1125-
background: var-get($theme, 'row-selected-hover-background');
1126-
}
1127-
}
1128-
1129-
%igx-grid__tree-grouping-indicator {
1130-
color: var-get($theme, 'row-selected-text-color');
1131-
1132-
&:hover {
1133-
color: var-get($theme, 'row-selected-text-color');
1134-
}
1135-
}
1136-
}
1137-
11381110
%igx-grid__tr--expanded {
11391111
border-bottom: none;
11401112
}
@@ -1352,6 +1324,7 @@
13521324
line-height: $grid-cell-lh;
13531325
color: inherit;
13541326
text-align: #{$left};
1327+
background-clip: border-box !important;
13551328
}
13561329

13571330
%igx-grid__td--tree-cell {
@@ -1385,6 +1358,7 @@
13851358
}
13861359
}
13871360

1361+
%grid-cell--pinned-selected,
13881362
%grid-cell--selected {
13891363
color: var-get($theme, 'cell-selected-text-color');
13901364
background: var-get($theme, 'cell-selected-background');
@@ -1398,6 +1372,35 @@
13981372
}
13991373
}
14001374

1375+
%grid-row--selected {
1376+
color: var-get($theme, 'row-selected-text-color');
1377+
background: var-get($theme, 'row-selected-background');
1378+
1379+
%grid-cell--selected,
1380+
%grid-cell--pinned-selected {
1381+
color: var-get($theme, 'cell-selected-within-text-color');
1382+
background: var-get($theme, 'cell-selected-within-background');
1383+
}
1384+
1385+
&:hover {
1386+
background: var-get($theme, 'row-selected-hover-background');
1387+
color: var-get($theme, 'row-selected-hover-text-color');
1388+
1389+
%grid-cell--column-selected {
1390+
color: var-get($theme, 'row-selected-hover-text-color');
1391+
background: var-get($theme, 'row-selected-hover-background');
1392+
}
1393+
}
1394+
1395+
%igx-grid__tree-grouping-indicator {
1396+
color: var-get($theme, 'row-selected-text-color');
1397+
1398+
&:hover {
1399+
color: var-get($theme, 'row-selected-text-color');
1400+
}
1401+
}
1402+
}
1403+
14011404
%grid-cell--column-selected {
14021405
color: var-get($theme, 'row-selected-text-color');
14031406
background: var-get($theme, 'row-selected-background');
@@ -1493,13 +1496,6 @@
14931496
z-index: 9999;
14941497
}
14951498

1496-
%grid-cell--pinned-selected {
1497-
color: var-get($theme, 'cell-selected-text-color');
1498-
background: var-get($theme, 'cell-selected-background');
1499-
// this is causing an issue https://github.com/IgniteUI/igniteui-angular/issues/4981
1500-
// border-bottom: 0;
1501-
}
1502-
15031499
%grid-cell--pinned--column-selected {
15041500
color: var-get($theme, 'row-selected-text-color');
15051501
background: var-get($theme, 'row-selected-background');
@@ -1665,8 +1661,23 @@
16651661
background: var-get($theme, 'header-selected-background');
16661662
opacity: if($variant != 'indigo-design', .7, 1);
16671663

1668-
.sort-icon::after {
1669-
background: var-get($theme, 'header-selected-background');
1664+
.sort-icon {
1665+
color: var-get($theme, 'header-selected-text-color');
1666+
1667+
::after {
1668+
background: var-get($theme, 'header-selected-background');
1669+
}
1670+
}
1671+
1672+
&%igx-grid-th--sorted {
1673+
.sort-icon {
1674+
color: var-get($theme, 'header-selected-text-color');
1675+
1676+
&:focus,
1677+
&:hover {
1678+
color: var-get($theme, 'header-selected-text-color');
1679+
}
1680+
}
16701681
}
16711682
}
16721683

@@ -1677,6 +1688,17 @@
16771688
.sort-icon::after {
16781689
background: var-get($theme, 'header-selected-background');
16791690
}
1691+
1692+
&%igx-grid-th--sorted {
1693+
.sort-icon {
1694+
color: var-get($theme, 'header-selected-text-color');
1695+
1696+
&:focus,
1697+
&:hover {
1698+
color: var-get($theme, 'header-selected-text-color');
1699+
}
1700+
}
1701+
}
16801702
}
16811703

16821704
%igx-grid-th--active {
@@ -1831,7 +1853,6 @@
18311853
border-bottom: none;
18321854
}
18331855

1834-
// %igx-grid-summary__label,
18351856
%igx-grid-summary__result {
18361857
color: var-get($theme, 'body-summaries-text-color');
18371858
}

0 commit comments

Comments
 (0)