Skip to content

Commit e6408ae

Browse files
dkamburovdkamburov
authored
Merge branch 'master' into pivot-grid-master
2 parents 2093f95 + bd5efcf commit e6408ae

File tree

7 files changed

+190
-145
lines changed

7 files changed

+190
-145
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ All notable changes for each version of this project will be documented in this
846846

847847
Changed the how the grid toolbar is instantiated in the grids. The
848848
toolbar is now templated rather than being activated through a property on the parent grid. The toolbar features are also exposed as templatable
849-
components and the old properties are deprecated.
849+
components and the old properties are deprecated. The implementation of the Column Hiding UI has been changed in order to select which columns should be displayed, instead of hidden.
850850

851851
Refer to the official documentation for more information.
852852
- `FilteringStrategy`

‎projects/igniteui-angular/migrations/update-13_0_0/changes/inputs.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"@scheme": "../../common/schema/binding.schema.json",
3+
"changes": [
4+
{
5+
"name": "color",
6+
"remove": "true",
7+
"owner": {
8+
"selector": "igx-icon",
9+
"type": "component"
10+
}
11+
}
12+
]
13+
}
14+

‎projects/igniteui-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"@angular/forms": "^13.0.0"
8888
},
8989
"igxDevDependencies": {
90-
"@igniteui/angular-schematics": "~13.0.900-rc.2"
90+
"@igniteui/angular-schematics": "~13.0.900"
9191
},
9292
"ng-update": {
9393
"migrations": "./migrations/migration-collection.json"

‎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
}
@@ -1357,6 +1329,7 @@
13571329
line-height: $grid-cell-lh;
13581330
color: inherit;
13591331
text-align: #{$left};
1332+
background-clip: border-box !important;
13601333
}
13611334

13621335
%igx-grid__td--tree-cell {
@@ -1390,6 +1363,7 @@
13901363
}
13911364
}
13921365

1366+
%grid-cell--pinned-selected,
13931367
%grid-cell--selected {
13941368
color: var-get($theme, 'cell-selected-text-color');
13951369
background: var-get($theme, 'cell-selected-background');
@@ -1403,6 +1377,35 @@
14031377
}
14041378
}
14051379

1380+
%grid-row--selected {
1381+
color: var-get($theme, 'row-selected-text-color');
1382+
background: var-get($theme, 'row-selected-background');
1383+
1384+
%grid-cell--selected,
1385+
%grid-cell--pinned-selected {
1386+
color: var-get($theme, 'cell-selected-within-text-color');
1387+
background: var-get($theme, 'cell-selected-within-background');
1388+
}
1389+
1390+
&:hover {
1391+
background: var-get($theme, 'row-selected-hover-background');
1392+
color: var-get($theme, 'row-selected-hover-text-color');
1393+
1394+
%grid-cell--column-selected {
1395+
color: var-get($theme, 'row-selected-hover-text-color');
1396+
background: var-get($theme, 'row-selected-hover-background');
1397+
}
1398+
}
1399+
1400+
%igx-grid__tree-grouping-indicator {
1401+
color: var-get($theme, 'row-selected-text-color');
1402+
1403+
&:hover {
1404+
color: var-get($theme, 'row-selected-text-color');
1405+
}
1406+
}
1407+
}
1408+
14061409
%grid-cell--column-selected {
14071410
color: var-get($theme, 'row-selected-text-color');
14081411
background: var-get($theme, 'row-selected-background');
@@ -1498,13 +1501,6 @@
14981501
z-index: 9999;
14991502
}
15001503

1501-
%grid-cell--pinned-selected {
1502-
color: var-get($theme, 'cell-selected-text-color');
1503-
background: var-get($theme, 'cell-selected-background');
1504-
// this is causing an issue https://github.com/IgniteUI/igniteui-angular/issues/4981
1505-
// border-bottom: 0;
1506-
}
1507-
15081504
%grid-cell--pinned--column-selected {
15091505
color: var-get($theme, 'row-selected-text-color');
15101506
background: var-get($theme, 'row-selected-background');
@@ -1670,8 +1666,23 @@
16701666
background: var-get($theme, 'header-selected-background');
16711667
opacity: if($variant != 'indigo-design', .7, 1);
16721668

1673-
.sort-icon::after {
1674-
background: var-get($theme, 'header-selected-background');
1669+
.sort-icon {
1670+
color: var-get($theme, 'header-selected-text-color');
1671+
1672+
::after {
1673+
background: var-get($theme, 'header-selected-background');
1674+
}
1675+
}
1676+
1677+
&%igx-grid-th--sorted {
1678+
.sort-icon {
1679+
color: var-get($theme, 'header-selected-text-color');
1680+
1681+
&:focus,
1682+
&:hover {
1683+
color: var-get($theme, 'header-selected-text-color');
1684+
}
1685+
}
16751686
}
16761687
}
16771688

@@ -1682,6 +1693,17 @@
16821693
.sort-icon::after {
16831694
background: var-get($theme, 'header-selected-background');
16841695
}
1696+
1697+
&%igx-grid-th--sorted {
1698+
.sort-icon {
1699+
color: var-get($theme, 'header-selected-text-color');
1700+
1701+
&:focus,
1702+
&:hover {
1703+
color: var-get($theme, 'header-selected-text-color');
1704+
}
1705+
}
1706+
}
16851707
}
16861708

16871709
%igx-grid-th--active {
@@ -1836,7 +1858,6 @@
18361858
border-bottom: none;
18371859
}
18381860

1839-
// %igx-grid-summary__label,
18401861
%igx-grid-summary__result {
18411862
color: var-get($theme, 'body-summaries-text-color');
18421863
}

0 commit comments

Comments
 (0)