Skip to content

Commit 54d8e0b

Browse files
author
MPopov
committed
Merge master and fix a conflict
2 parents e26a992 + 9831e6f commit 54d8e0b

File tree

76 files changed

+3062
-977
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+3062
-977
lines changed

.github/CONTRIBUTING.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ When logging issue you should assign `severity:` label. If you cannot determine
5656

5757
### Triaging
5858

59-
Before release a triaging is done. Issues that need to be fixed for the release are marked with `triage: blocking` status.
59+
Issues that block other issues completion are marked with `triage: blocking` status.
60+
61+
### Priority
62+
63+
Issues that need to be addressed immediately are marked with `priority: high` status.
6064

6165
## Testing - applicable to pull requests
6266
1. `status: awaiting-test` this is the initial status of pull requests. If you're performing the pull request, please place this status on it. Pull requests are accepted if and only if all status checks pass, review is performed, and the pull request has been tested and contains `status: verified`.

CHANGELOG.md

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes for each version of this project will be documented in this file.
44

5+
## 8.1.2
6+
7+
### New Features
8+
- `IgxDatePicker`
9+
- `valueChange` event is added.
10+
511
## 8.1.0
612

713
### New Features
@@ -37,7 +43,7 @@ This is an example of how you can use the new theme.
3743
- **Behavioral Change** - paging now includes the group rows in the page size. You may find more information about the change in the [GroupBy Specification](https://github.com/IgniteUI/igniteui-angular/wiki/Group-By-Specification)
3844
- `IgxColumnGroup`
3945
- Re-templating the column group header is now possible using the `headerTemplate` input property or the `igxHeader` directive.
40-
- `igx-grid-footer`
46+
- `igx-grid-footer`
4147
- You can use this to insert a custom footer in the grids.
4248
```html
4349
<igx-grid>
@@ -63,21 +69,21 @@ This is an example of how you can use the new theme.
6369

6470
## 8.0.2
6571
- `igx-list-theme` now have some new parameters for styling.
66-
- $item-background-hover - Change The list item hover background
72+
- $item-background-hover - Change The list item hover background
6773
- $item-text-color-hover - Change The list item hover text color.
68-
74+
6975
- $item-subtitle-color - Change The list item subtitle color.
7076
- $item-subtitle-color-hover - Change The list item hover subtitle color.
7177
- $item-subtitle-color-active - Change The active list item subtitle color.
72-
78+
7379
- $item-action-color - Change The list item actions color.
7480
- $item-action-color-hover - Change The list item hover actions color.
7581
- $item-action-color-active - Change The active list item actions color.
76-
82+
7783
- $item-thumbnail-color - Change The list item thumbnail color.
7884
- $item-thumbnail-color-hover - Change The list item hover thumbnail color.
7985
- $item-thumbnail-color-active - Change The active list item thumbnail color.
80-
86+
8187
- **Behavioral Change** default min column width is changed according the grid display density property:
8288
- for `DisplayDensity.comfortable` defaultMinWidth is `80px`;
8389
- for `DisplayDensity.cosy` defaultMinWidth is `64px`;

ROADMAP.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
2. IgxGrid row and cell selection modes [#4989](https://github.com/IgniteUI/igniteui-angular/issues/4989)
99
3. Fluent Theme [#5335](https://github.com/IgniteUI/igniteui-angular/issues/5335)
1010
4. Drag and Drop enhancements [#5319](https://github.com/IgniteUI/igniteui-angular/issues/5319)
11+
5. Multi-View Calendar + Range DatePicker [#4282](https://github.com/IgniteUI/igniteui-angular/issues/4282)
12+
6. Custom grid row selector templates [#4998](https://github.com/IgniteUI/igniteui-angular/issues/4998)
13+
7. Per-column Filtering Strategies [#5323](https://github.com/IgniteUI/igniteui-angular/issues/5323)
1114

1215
## Going down the road
1316

projects/igniteui-angular/src/lib/chips/chip.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
IDragStartEventArgs,
2020
IgxDropEnterEventArgs,
2121
IgxDropEventArgs
22-
} from '../directives/dragdrop/dragdrop.directive';
22+
} from '../directives/drag-drop/drag-drop.directive';
2323

2424

2525
export interface IBaseChipEventArgs {

projects/igniteui-angular/src/lib/chips/chips-area.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
} from './chip.component';
2424
import {
2525
IgxDropEnterEventArgs
26-
} from '../directives/dragdrop/dragdrop.directive';
26+
} from '../directives/drag-drop/drag-drop.directive';
2727
import { takeUntil } from 'rxjs/operators';
2828
import { Subject } from 'rxjs/internal/Subject';
2929

projects/igniteui-angular/src/lib/chips/chips.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { IgxAvatarModule } from '../avatar/avatar.component';
66
import { IgxIconModule } from '../icon/index';
77
import { IgxChipComponent } from './chip.component';
88
import { IgxChipsAreaComponent } from './chips-area.component';
9-
import { IgxDragDropModule } from '../directives/dragdrop/dragdrop.directive';
9+
import { IgxDragDropModule } from '../directives/drag-drop/drag-drop.directive';
1010
import { IgxPrefixModule, IgxPrefixDirective} from '../directives/prefix/prefix.directive';
1111
import { IgxSuffixModule, IgxSuffixDirective } from '../directives/suffix/suffix.directive';
1212

projects/igniteui-angular/src/lib/core/styles/components/grid/_excel-filtering-component.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@
6868
@extend %grid-excel-actions__action !optional;
6969
}
7070

71+
@include e(actions-pin, $m: disabled) {
72+
@extend %grid-excel-actions__action !optional;
73+
@extend %grid-excel-actions__action--disabled !optional;
74+
}
75+
7176
@include e(actions-unpin) {
7277
@extend %grid-excel-actions__action !optional;
7378
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
/// @param {Color} $header-border-color [null] - The color used for header borders.
1919
///
2020
/// @param {Color} $sorted-header-icon-color [null] - The sort icon color when sorted.
21+
/// @param {color} $sortable-header-icon-hover-color [null] - The icon color on hover in grid header when the column is sortable.
2122
///
2223
/// @param {Color} $content-background [null] - The table body background color.
2324
/// @param {Color} $content-text-color [null] - The table body text color.
@@ -194,8 +195,8 @@
194195
$row-ghost-background: null,
195196
$row-drag-color: null,
196197
$drop-area-border-radius: null,
197-
198-
$grid-border-color: null
198+
$grid-border-color: null,
199+
$sortable-header-icon-hover-color: null
199200
) {
200201
$name: 'igx-grid';
201202
$grid-schema: map-get($schema, $name);
@@ -484,6 +485,7 @@
484485
row-ghost-background: $row-ghost-background,
485486
row-drag-color: $row-drag-color,
486487
drop-area-border-radius: $drop-area-border-radius,
488+
sortable-header-icon-hover-color: $sortable-header-icon-hover-color,
487489
grid-border-color: $grid-border-color,
488490
));
489491
}

projects/igniteui-angular/src/lib/core/styles/components/list/_list-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@
373373
}
374374

375375
%igx-list__item-lines {
376-
color: --var($theme, 'item-text-color');
376+
color: currentColor;
377377
display: flex;
378378
flex-direction: column;
379379
flex: 1 0 0%;

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_grid.scss

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
/// @prop {Map} header-background [igx-color: ('grays', 100), hexrgba: #fff] - The table header background color.
1313
/// @prop {Map} header-text-color [igx-color: ('grays', 600)] - The table header text color.
1414
///
15-
/// @prop {Map} $sorted-header-icon-color [igx-color: ('secondary', 500)] - The sorted table header icon color.
15+
/// @prop {Map} sorted-header-icon-color [igx-color: ('secondary', 500)] - The sorted table header icon color.
16+
/// @prop {Map} sortable-header-icon-hover-color [igx-color: ('secondary', 500)] - The icon color on hover in grid header when the column is sortable.
1617
///
1718
/// @prop {Number} header-border-width [1px] - The border width used for header borders.
1819
/// @prop {String} header-border-style [solid] - The border style used for header borders.
@@ -94,22 +95,10 @@ $_light-grid: extend(
9495
igx-color: ('grays', 600)
9596
),
9697

97-
sortable-header-hover-color: (
98-
igx-color: ('grays', 900)
99-
),
100-
101-
sortable-header-hover-icon-color: (
102-
igx-color: ('grays', 500)
103-
),
104-
10598
sortable-header-icon-hover-color: (
10699
igx-color: ('secondary', 500)
107100
),
108101

109-
sorted-header-color: (
110-
igx-color: ('grays', 900)
111-
),
112-
113102
sorted-header-icon-color: (
114103
igx-color: ('secondary', 500)
115104
),

0 commit comments

Comments
 (0)