Skip to content

Commit 7984775

Browse files
authored
Merge pull request #5526 from IgniteUI/fix-for-5432-master
docs(Grid): Fix missing @param in sassdocs and remove unnecessary properties in the light schema
2 parents 38b7aaa + 0cce956 commit 7984775

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

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

Lines changed: 4 additions & 1 deletion
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.
@@ -192,6 +193,7 @@
192193
$row-ghost-background: null,
193194
$row-drag-color: null,
194195
$drop-area-border-radius: null,
196+
$sortable-header-icon-hover-color: null
195197
) {
196198
$name: 'igx-grid';
197199
$grid-schema: map-get($schema, $name);
@@ -474,7 +476,8 @@
474476
drag-shadow: $drag-shadow,
475477
row-ghost-background: $row-ghost-background,
476478
row-drag-color: $row-drag-color,
477-
drop-area-border-radius: $drop-area-border-radius
479+
drop-area-border-radius: $drop-area-border-radius,
480+
sortable-header-icon-hover-color: $sortable-header-icon-hover-color
478481
));
479482
}
480483

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.
@@ -85,22 +86,10 @@ $_light-grid: extend(
8586
igx-color: ('grays', 600)
8687
),
8788

88-
sortable-header-hover-color: (
89-
igx-color: ('grays', 900)
90-
),
91-
92-
sortable-header-hover-icon-color: (
93-
igx-color: ('grays', 500)
94-
),
95-
9689
sortable-header-icon-hover-color: (
9790
igx-color: ('secondary', 500)
9891
),
9992

100-
sorted-header-color: (
101-
igx-color: ('grays', 900)
102-
),
103-
10493
sorted-header-icon-color: (
10594
igx-color: ('secondary', 500)
10695
),

0 commit comments

Comments
 (0)