Skip to content

Commit 9e33dd2

Browse files
authored
Merge pull request #11185 from IgniteUI/13.1.x
Merging 13.1.x into master
2 parents 651fa82 + c3e5a17 commit 9e33dd2

File tree

136 files changed

+8136
-6808
lines changed

Some content is hidden

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

136 files changed

+8136
-6808
lines changed

.gitattributes

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
* text=auto
2+
3+
*.js eol=lf
4+
*.ts eol=lf
5+
*.json eol=lf

README.md

+254-254
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
{
2-
"$schema": "../../common/schema/class.schema.json",
3-
"changes": [{
4-
"name": "IgxHierarchicalGridCellComponent",
5-
"replaceWith": "CellType"
6-
},
7-
{
8-
"name": "IgxGridCellComponent",
9-
"replaceWith": "CellType"
10-
},
11-
{
12-
"name": "IgxTreeGridCellComponent",
13-
"replaceWith": "CellType"
14-
},
15-
{
16-
"name": "IgxGridExpandableCellComponent",
17-
"replaceWith": "CellType"
18-
},
19-
{
20-
"name": "IComboSelectionChangeEventArgs",
21-
"replaceWith": "IComboSelectionChangingEventArgs"
22-
},
23-
{
24-
"name": "AutocompleteItemSelectionEventArgs",
25-
"replaceWith": "AutocompleteSelectionChangingEventArgs"
26-
}
27-
]
28-
}
1+
{
2+
"$schema": "../../common/schema/class.schema.json",
3+
"changes": [{
4+
"name": "IgxHierarchicalGridCellComponent",
5+
"replaceWith": "CellType"
6+
},
7+
{
8+
"name": "IgxGridCellComponent",
9+
"replaceWith": "CellType"
10+
},
11+
{
12+
"name": "IgxTreeGridCellComponent",
13+
"replaceWith": "CellType"
14+
},
15+
{
16+
"name": "IgxGridExpandableCellComponent",
17+
"replaceWith": "CellType"
18+
},
19+
{
20+
"name": "IComboSelectionChangeEventArgs",
21+
"replaceWith": "IComboSelectionChangingEventArgs"
22+
},
23+
{
24+
"name": "AutocompleteItemSelectionEventArgs",
25+
"replaceWith": "AutocompleteSelectionChangingEventArgs"
26+
}
27+
]
28+
}

projects/igniteui-angular/src/lib/card/card.component.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ export class IgxCardActionsComponent implements OnInit, OnChanges {
316316
*/
317317
@HostBinding('class.igx-card-actions--vertical')
318318
@Input()
319-
public vertical: boolean;
319+
public vertical = false;
320320

321321
/**
322322
* A getter that returns `true` when the layout has been
@@ -365,7 +365,9 @@ export class IgxCardActionsComponent implements OnInit, OnChanges {
365365
* @internal
366366
*/
367367
public ngOnInit() {
368-
this.vertical = !this.isVerticalSet && this.card.horizontal;
368+
if (!this.isVerticalSet && this.card.horizontal) {
369+
this.vertical = true;
370+
};
369371
}
370372
}
371373

0 commit comments

Comments
 (0)