Skip to content

Commit f22bb12

Browse files
author
MPopov
committed
fix(fix contrast colors fo bootstrap theme):
Closes #6613
1 parent d8f6829 commit f22bb12

File tree

10 files changed

+85
-7
lines changed

10 files changed

+85
-7
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@
232232

233233
igx-list {
234234
margin: rem(8px) -#{rem(16px)} 0;
235+
border: 0;
235236
border-top: 1px dashed igx-color($palette, 'grays', 300);
236237
border-bottom: 1px dashed igx-color($palette, 'grays', 300);
237238
}

projects/igniteui-angular/src/lib/core/styles/components/paginator/_paginator-theme.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@
4141

4242
$theme: apply-palette($grid-paginator-schema, $palette);
4343

44+
45+
@if not($text-color) and $background-color {
46+
$text-color: text-contrast($background-color);
47+
}
48+
4449
@return extend($theme, (
4550
name: $name,
4651
palette: $palette,

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,9 @@ $_dark-fluent-banner: extend($_fluent-banner);
2222
/// @type {Map}
2323
/// @requires extend
2424
/// @requires $_bootstrap-banner
25-
$_dark-bootstrap-banner: extend($_bootstrap-banner);
25+
$_dark-bootstrap-banner: extend(
26+
$_bootstrap-banner,
27+
(
28+
banner-background: #333,
29+
)
30+
);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ $_dark-bootstrap-list: extend(
4646
$_bootstrap-list,
4747
$_base-dark-list,
4848
(
49+
background: #222,
4950
item-background: #222,
5051
header-background: #222,
5152
)

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,17 @@ $_fluent-banner: extend($_light-banner);
4848
/// @type {Map}
4949
/// @requires {function} extend
5050
/// @requires $_light-banner
51-
$_bootstrap-banner: extend($_light-banner);
51+
$_bootstrap-banner: extend(
52+
$_light-banner,
53+
(
54+
banner-background: #fff,
55+
56+
banner-message-color: (
57+
igx-color: ('grays', 800)
58+
),
59+
60+
banner-illustration-color: (
61+
igx-color: ('grays', 800)
62+
)
63+
)
64+
);

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ $_light-calendar: extend(
5656
$_default-shape-calendar,
5757
(
5858
variant: 'material',
59+
5960
content-background: (
6061
igx-color: 'surface'
6162
),
@@ -289,8 +290,6 @@ $_bootstrap-calendar: extend(
289290
igx-color: ('primary', 800)
290291
),
291292

292-
picker-text-color: #000,
293-
294293
year-current-text-color: (
295294
igx-color: ('primary', 500)
296295
),
@@ -324,6 +323,22 @@ $_bootstrap-calendar: extend(
324323
date-selected-text-color: #fff,
325324

326325
content-background: #fff,
326+
327+
content-text-color: (
328+
igx-color: ('grays', 900)
329+
),
330+
331+
weekend-text-color: (
332+
igx-color: ('grays', 900)
333+
),
334+
335+
picker-text-color: (
336+
igx-color: ('grays', 900)
337+
),
338+
339+
inactive-text-color: (
340+
igx-color: ('grays', 500)
341+
),
327342
)
328343
);
329344

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,22 @@ $_bootstrap-card: extend(
105105
outline-color: (
106106
igx-color: ('grays', 300)
107107
),
108+
109+
header-text-color: (
110+
igx-color: ('grays', 900)
111+
),
112+
113+
subtitle-text-color: (
114+
igx-color: ('grays', 800)
115+
),
116+
117+
content-text-color: (
118+
igx-color: ('grays', 800)
119+
),
120+
121+
actions-text-color: (
122+
igx-color: ('grays', 900)
123+
),
108124
)
109125
);
110126

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,11 @@ $_bootstrap-drop-down: extend(
222222

223223
selected-focus-item-text-color: #fff,
224224

225-
border-width: 1px
225+
border-width: 1px,
226+
227+
disabled-item-text-color: (
228+
igx-color: ('grays', 400)
229+
),
226230
)
227231
);
228232

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,18 @@ $_bootstrap-list: extend(
158158
igx-color: ('grays', 100),
159159
hexrgba: (#fff)
160160
),
161+
162+
item-text-color: (
163+
igx-color: ('grays', 900)
164+
),
165+
166+
item-text-color-hover: (
167+
igx-color: ('grays', 900)
168+
),
169+
170+
item-text-color-active: (
171+
igx-color: ('grays', 900)
172+
),
161173
)
162174
);
163175

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,16 @@
88

99
/// Generates a light pagination schema.
1010
/// @type {Map}
11-
/// @prop {Color} text-color [currentColor] - The text color.
11+
/// @prop {Map} text-color [igx-color: ('grays', 800)] - The text color.
1212
/// @prop {Map} background-color [igx-color: ('grays', 100), hexrgba: #fff] - The background color of the paging panel.
1313
/// @prop {Map} border-color [igx-color: ('grays', 400)] - The border color of the paging panel.
1414
/// @see $default-palette
1515
$_light-pagination: (
16-
text-color: currentColor,
16+
variant: 'material',
17+
18+
text-color: (
19+
igx-color: ('grays', 800)
20+
),
1721

1822
background-color: (
1923
igx-color: ('grays', 100),
@@ -34,6 +38,8 @@ $_light-pagination: (
3438
$_fluent-pagination: extend(
3539
$_light-pagination,
3640
(
41+
variant: 'material',
42+
3743
background-color: (
3844
igx-color: 'surface'
3945
),

0 commit comments

Comments
 (0)