Skip to content

Commit e7ceb5b

Browse files
authored
Merge branch 'simeonoff/indigo-theme' into didimmova/fix-sassdoc
2 parents 53d29ca + 2822d81 commit e7ceb5b

File tree

5 files changed

+44
-18
lines changed

5 files changed

+44
-18
lines changed

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1557,18 +1557,11 @@
15571557
}
15581558

15591559
%igx-grid__th--active {
1560-
@extend %grid-cell--active;
1561-
1560+
%grid-cell-header,
15621561
%igx-grid__th--selected,
15631562
%igx-grid__th--selectable {
15641563
@extend %grid-cell--active
15651564
}
1566-
1567-
%igx-grid__filtering-cell,
1568-
%grid-cell-header {
1569-
border-right: none;
1570-
border-bottom: none;
1571-
}
15721565
}
15731566

15741567
%igx-grid-summary--active {

projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_chip.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ $_dark-bootstrap-chip: extend($_bootstrap-chip, $_base-dark-chip);
4040
/// Generates a dark indigo chip schema based on a mix of $_indigo-chip and $_base-dark-chip.
4141
/// @type {Map}
4242
/// @prop {Map} background [igx-color: ('grays', 500)] - The chip background color.
43+
/// @prop {Map} ghost-background [igx-color: ('grays', 300), to-opaque: (igx-color: 'surface')] - The chip ghost background color.
4344
/// @prop {Map} hover-background [igx-color: ('grays', 300)] - The chip hover background color.
4445
/// @prop {Map} focus-background [igx-color: ('grays', 300)] The focused chip background color.
4546
/// @requires {function} extend
@@ -53,6 +54,14 @@ $_dark-indigo-chip: extend(
5354
igx-color: ('grays', 500)
5455
),
5556

57+
ghost-background: (
58+
igx-color: ('grays', 300),
59+
60+
to-opaque: (
61+
igx-color: 'surface',
62+
)
63+
),
64+
5665
hover-background: (
5766
igx-color: ('grays', 300)
5867
),

projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_list.scss

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,33 @@ $_dark-bootstrap-list: extend(
5757

5858
/// Generates a dark indigo list schema
5959
/// @type {Map}
60-
/// @property {Map} header-text-color [#fff] - The list header text color.
61-
/// @property {Map} item-background-hover [igx-color: ('primary', 500), rgba: .5] - The list item hover background.
62-
/// @property {Map} item-background-active [igx-color: ('primary', 500), rgba: .5] - The active list item background color.
60+
/// @property {Map} header-text-color [igx-contrast-color: 'surface'] - The list header text color.
61+
/// @property {Map} item-background-hover [igx-color: ('primary', 500), rgba: .5, to-opaque: (igx-color: 'surface')] - The list item hover background.
62+
/// @property {Map} item-background-active [igx-color: ('primary', 500), rgba: .5, to-opaque: (igx-color: 'surface')] - The active list item background color.
6363
/// @requires {function} extend
6464
/// @requires $_indigo-list
6565
$_dark-indigo-list: extend(
6666
$_indigo-list,
6767
(
68-
header-text-color: #fff,
68+
header-text-color: (
69+
igx-contrast-color: 'surface'
70+
),
6971

7072
item-background-hover: (
7173
igx-color: ('primary', 500),
72-
rgba: .5
74+
rgba: .5,
75+
to-opaque: (
76+
igx-color: 'surface',
77+
)
78+
7379
),
7480

7581
item-background-active: (
7682
igx-color: ('primary', 500),
77-
rgba: .5
83+
rgba: .5,
84+
to-opaque: (
85+
igx-color: 'surface',
86+
)
7887
)
7988
)
8089
);

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ $_bootstrap-chip: extend(
207207
/// @prop {Number} border-radius [3px] - The border radius fraction used for chip component.
208208
/// @prop {Color} text-color [#fff] - The chip text color.
209209
/// @prop {Map} background [igx-color: ('grays', 600)] - The chip background color.
210+
/// @prop {Map} ghost-background [igx-color: ('grays', 800), to-opaque: (igx-color: 'surface')] - The chip ghost background color.
210211
/// @prop {Color} hover-text-color [#fff] - The chip text hover color.
211212
/// @prop {Map} hover-background [igx-color: ('grays', 800)] - The chip hover background color.
212213
/// @prop {Color} focus-text-color [#fff] The focused chip text color.
@@ -230,6 +231,14 @@ $_indigo-chip: extend(
230231
igx-color: ('grays', 600)
231232
),
232233

234+
ghost-background: (
235+
igx-color: ('grays', 800),
236+
237+
to-opaque: (
238+
igx-color: 'surface',
239+
)
240+
),
241+
233242
text-color: #fff,
234243

235244
hover-text-color: #fff,

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ $_bootstrap-list: extend(
183183
///
184184
/// @property {Map} header-text-color [igx-color: ('primary', 500)] - The list header text color.
185185
///
186-
/// @property {Map} item-background-hover [igx-color: ('primary', 500), rgba: .15] - The list item hover background.
187-
/// @property {Map} item-background-active [igx-color: ('primary', 500), rgba: .15] - The active list item background color.
186+
/// @property {Map} item-background-hover [igx-color: ('primary', 500), rgba: .15, to-opaque: (igx-color: 'surface')] - The list item hover background.
187+
/// @property {Map} item-background-active [ igx-color: ('primary', 500), rgba: .15, to-opaque: (igx-color: 'surface')] - The active list item background color.
188188
///
189189
/// @property {Map} item-text-color [igx-color: ('grays', 900)] - The list item text color.
190190
/// @property {Map} item-text-color-hover [igx-color: ('grays', 900)] - The list item text color.
@@ -218,12 +218,18 @@ $_indigo-list: extend(
218218

219219
item-background-hover: (
220220
igx-color: ('primary', 500),
221-
rgba: .15
221+
rgba: .15,
222+
to-opaque: (
223+
igx-color: 'surface',
224+
)
222225
),
223226

224227
item-background-active: (
225228
igx-color: ('primary', 500),
226-
rgba: .15
229+
rgba: .15,
230+
to-opaque: (
231+
igx-color: 'surface',
232+
)
227233
),
228234

229235
item-text-color: (

0 commit comments

Comments
 (0)