Commit 4e8c731
MPopov
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into fluent-theme
# Conflicts:
# projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-theme.scss
# projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_calendar.scss
# projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_calendar.scssFile tree
124 files changed
+3505
-1671
lines changed- projects/igniteui-angular
- src
- lib
- calendar
- days-view
- combo
- core
- styles
- components
- _common
- calendar
- date-picker
- themes/schemas
- dark
- light
- directives/for-of
- drop-down
- grids
- grid
- hierarchical-grid
- summaries
- tree-grid
- list
- test-utils
- src/app
- calendar
- grid-auto-size
- grid-cellEditing
- grid-flex-layout
- grid-multi-row-layout-config
- grid-performance
- grid-summaries
- grid
- hierarchical-grid-updating
- tabs-routing
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
124 files changed
+3505
-1671
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| 20 | + | |
20 | 21 | | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
24 | | - | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
25 | 30 | | |
26 | 31 | | |
27 | 32 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
17 | 37 | | |
18 | 38 | | |
19 | 39 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
10 | 15 | | |
11 | 16 | | |
12 | 17 | | |
13 | 18 | | |
14 | 19 | | |
15 | 20 | | |
16 | | - | |
17 | | - | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
18 | 28 | | |
19 | 29 | | |
20 | 30 | | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
21 | 46 | | |
22 | 47 | | |
23 | 48 | | |
| |||
0 commit comments