Skip to content

Commit 19ba672

Browse files
authored
Merge pull request #7818 from IgniteUI/SIvanova/fix-dark-indigo-carousel
fix(carousel): fix carousel docs & buttons low contrast
2 parents 2822d81 + d476f83 commit 19ba672

File tree

2 files changed

+39
-12
lines changed

2 files changed

+39
-12
lines changed

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,32 @@ $_dark-bootstrap-carousel: extend($_bootstrap-carousel, $_base-dark-carousel);
5151
/// Generates a dark indigo carousel schema based on a mix of $_indigo-carousel and $_base-dark-carousel
5252
/// @type {Map}
5353
/// @prop {Color} slide-background [#222] - The slide background color.
54-
/// @prop {Color} button-background [igx-color: ('grays', 500)] - The previous/next buttons idle background color.
55-
/// @prop {Color} button-hover-background [igx-color: ('grays', 300)] - The previous/next buttons hover background color.
56-
/// @prop {Color} indicator-dot-color [igx-color: ('grays', 600)] - The idle indicator dot color.
57-
/// @prop {Color} indicator-active-dot-color [igx-color: ('grays', 900)] - The active indicator dot color.
54+
/// @prop {Map} button-background [igx-color: ('grays', 400)] - The previous/next buttons idle background color.
55+
/// @prop {Map} button-hover-background [igx-color: ('grays', 200)] - The previous/next buttons hover background color.
56+
/// @prop {Map} button-arrow-color [igx-color: ('grays', 800)] - The previous/next buttons idle arrow color.
57+
/// @prop {Map} button-hover-arrow-color [igx-color: ('grays', 900)] - The previous/next buttons hover arrow color.
58+
/// @prop {Map} indicator-dot-color [igx-color: ('grays', 600)] - The idle indicator dot color.
59+
/// @prop {Map} indicator-active-dot-color [igx-color: ('grays', 900)] - The active indicator dot color.
5860
/// @requires extend
5961
/// @requires $_indigo-carousel
6062
/// @requires $_base-dark-carousel
6163
$_dark-indigo-carousel: extend($_indigo-carousel, (
6264
slide-background: #222,
6365

6466
button-background: (
65-
igx-color: ('grays' 500),
67+
igx-color: ('grays' 400),
6668
),
6769

6870
button-hover-background: (
69-
igx-color: ('grays' 300),
71+
igx-color: ('grays' 200),
72+
),
73+
74+
button-arrow-color: (
75+
igx-color: ('grays', 800)
76+
),
77+
78+
button-hover-arrow-color: (
79+
igx-color: ('grays', 900)
7080
),
7181

7282
indicator-dot-color: (

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

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ $_light-carousel: extend(
6262
/// @type {Map}
6363
/// @requires {function} extend
6464
/// @requires {map} $_light-carousel
65+
/// @requires {map} $_square-shape-carousel
6566
/// @requires {map} $_fluent-elevation-carousel
6667
/// @see $default-palette
6768
$_fluent-carousel: extend(
@@ -74,26 +75,40 @@ $_fluent-carousel: extend(
7475
/// @type {Map}
7576
/// @requires {function} extend
7677
/// @requires {map} $_light-carousel
78+
/// @requires {map} $_bootstrap-shape-carousel
79+
/// @requires {map} $_bootstrap-elevation-carousel
7780
$_bootstrap-carousel: extend(
7881
$_light-carousel,
7982
$_bootstrap-shape-carousel,
80-
$_fluent-elevation-carousel, (
83+
$_bootstrap-elevation-carousel, (
8184
variant: 'bootstrap'
8285
)
8386
);
8487

8588
/// Generates an indigo carousel schema.
8689
/// @type {Map}
90+
/// @prop {Map} button-background [igx-color: 'surface', rgba: .4] - The previous/next buttons idle background color.
91+
/// @prop {Map} button-hover-background [igx-color: 'surface', rgba: .65] - The previous/next buttons hover background color.
92+
/// @prop {Color} button-disabled-background [transparent] - The previous/next buttons disabled background color.
93+
/// @prop {Map} button-arrow-color [igx-color: ('grays', 600)] - The previous/next buttons idle arrow color.
94+
/// @prop {Map} button-hover-arrow-color [igx-color: ('grays', 700)] - The previous/next buttons hover arrow color.
95+
/// @prop {Map} button-disabled-arrow-color [igx-color: ('grays' 400)] - The previous/next buttons disabled color.
96+
/// @prop {Map} indicator-dot-color [igx-color: 'surface', rgba: .6] - The idle indicator dot color.
97+
/// @prop {Map} indicator-active-dot-color [igx-color: 'surface'] - The active indicator dot color.
98+
/// @prop {Number} border-radius [0] - The border radius fraction, between 0-1 to be used for carousel.
99+
///
87100
/// @requires {function} extend
88101
/// @requires {map} $_light-carousel
102+
/// @requires {map} $_default-shape-carousel
103+
/// @requires {map} $_indigo-elevation-carousel
89104
$_indigo-carousel: extend(
90105
$_light-carousel,
91-
$_square-shape-carousel,
106+
$_default-shape-carousel,
92107
$_indigo-elevation-carousel, (
93108
variant: 'indigo-design',
94109

95110
button-background: (
96-
igx-color: #fff,
111+
igx-color: 'surface',
97112
rgba: .4
98113
),
99114

@@ -102,7 +117,7 @@ $_indigo-carousel: extend(
102117
),
103118

104119
button-hover-background: (
105-
igx-color: #fff,
120+
igx-color: 'surface',
106121
rgba: .65,
107122
),
108123

@@ -117,11 +132,13 @@ $_indigo-carousel: extend(
117132
),
118133

119134
indicator-dot-color: (
120-
igx-color: #fff,
135+
igx-color: 'surface',
121136
rgba: .6
122137
),
123138

124-
indicator-active-dot-color: #fff,
139+
indicator-active-dot-color:(
140+
igx-color: 'surface'
141+
),
125142
)
126143
);
127144

0 commit comments

Comments
 (0)