Skip to content

style(switch/radio): update switch/radio in fluent theme #11242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 17, 2022
Merged

style(switch/radio): update switch/radio in fluent theme #11242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions projects/igniteui-angular/src/lib/core/styles/components/radio/_radio-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,13 @@
%radio-composite--x {
&::before {
border: $border-width $border-style var-get($theme, 'fill-color');
background: var-get($theme, 'fill-color');
transform: $scale;

@if $bootstrap-theme {
border-color: var-get($theme, 'fill-hover-border-color');
background: var-get($theme, 'fill-hover-border-color');
}

background: var-get($theme, 'fill-color-hover');
transform: $scale;
}

&::after {
Expand All @@ -223,7 +223,7 @@

%igx-radio-hover__composite {
&::before {
background: var-get($theme, 'fill-color-hover');
background: var-get($theme, 'hover-color');
transform: $radio-hover-scale;
}
}
Expand Down
13 changes: 12 additions & 1 deletion projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_radio.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,19 @@ $dark-radio: $light-radio;

/// Generates a dark fluent radio schema.
/// @type {Map}
/// @property {Map} fill-hover-border-color [color: ('primary', 200)] - The text color used for the label text.
/// @property {Map} fill-color-hover [color: ('primary', 200)] - The checked border and dot colors on hover.
/// @requires {function} extend
/// @requires $fluent-radio
$dark-fluent-radio: $fluent-radio;
$dark-fluent-radio: extend($fluent-radio, (
fill-hover-border-color: (
color: ('primary', 200)
),

fill-color-hover: (
color: ('primary', 200)
),
));

/// Generates a dark bootstrap radio schema.
/// @type {Map}
Expand Down
24 changes: 12 additions & 12 deletions projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_radio.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ $light-radio: (
/// Generates a fluent radio schema.
/// @type {Map}
///
/// @property {Map} hover-color [color: ('grays', 800)] - The text color used for the label text.
/// @property {Map} fill-hover-border-color [color: ('secondary', 600)] - The checked dot border color on hover.
/// @property {Map} empty-color [color: ('grays', 800)] - The unchecked border color.
/// @property {Map} fill-color [color: ('secondary', 300)] - The checked border and dot colors.
/// @property {Map} fill-color-hover [color: ('secondary',3500)] - The checked border and dot colors on hover.
/// @property {Map} focus-outline-color [color: ('grays', 800)] - The focus outlined color.
/// @property {Color} hover-color [color: ('grays', 700)] - The border and dot colors on hover.
/// @property {Color} fill-hover-border-color [color: ('primary', 900)] - The checked dot border color on hover.
/// @property {Color} empty-color [color: ('grays', 900)] - The unchecked border color.
/// @property {Color} fill-color [color: ('primary', 500)] - The checked border and dot colors.
/// @property {Color} fill-color-hover [color: ('primary',900)] - The checked border and dot colors on hover.
/// @property {Color} focus-outline-color [color: ('grays', 700)] - The focus outlined color.
///
/// @requires {function} extend
/// @requires {Map} $light-radio
Expand All @@ -71,27 +71,27 @@ $fluent-radio: extend(
variant: 'fluent',

focus-outline-color: (
color: ('grays', 800)
color: ('grays', 700)
),

hover-color: (
color: ('grays', 800)
color: ('grays', 700)
),

fill-hover-border-color: (
color: ('secondary', 600)
color: ('primary', 900)
),

empty-color: (
color: ('grays', 800)
color: ('grays', 900)
),

fill-color: (
color: ('secondary', 300)
color: ('primary', 500)
),

fill-color-hover: (
color: ('secondary', 300)
color: ('primary', 900)
),
)
);
Expand Down
12 changes: 6 additions & 6 deletions projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_switch.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,18 @@ $light-switch: extend(
/// @property {Color} border-hover-color [color('grays', 800)] - The border color of the switch on hover.
/// @property {Color} border-disabled-color [color('grays', 400)] - The border color of the disabled switch.
/// @property {Color} border-on-color [color('primary', 500)] - The border color of the on-switch.
/// @property {Color} border-on-hover-color [color('primary', 800)] - The border color of the on-switch.
/// @property {Color} border-on-hover-color [color('primary', 900)] - The border color of the on-switch.
///
/// @property {Color} thumb-on-color [color: ('grays', 50)] - The color of the thumb when the switch is on.
/// @property {Color} thumb-off-color [color: ('grays', 700)] - The color of the thumb when the switch is off.
/// @property {Color} track-on-color [color: ('primary', 500)] - The color of the track when the switch is on.
/// @property {Color} track-off-color [transparent] - The color of the track when the switch is off.
/// @property {Color} track-on-hover-color [color: ('primary', 800)] - The color of the track when the switch is on and hovered.
/// @property {Color} track-on-hover-color [color: ('primary', 900)] - The color of the track when the switch is on and hovered.
/// @property {Color} track-on-disabled-color [color: ('grays', 400)] - The color of the track when the switch is on and disabled.
/// @property {Color} track-disabled-color [transparent] - The color of the track when the switch is disabled.
/// @property {Color} thumb-disabled-color [color: ('grays', 400)] - The color of the thumb when the switch is disabled.
/// @property {Color} thumb-on-disabled-color [color: ('grays', 100)] - The color of the thumb when the switch is on and disabled.
/// @property {Color} focus-outline-color [color: ('grays', 800)] - The focus outlined color.
/// @property {Color} focus-outline-color [color: ('grays', 700)] - The focus outlined color.
///
/// @property {Number} border-radius-track [10px] - The border radius used for switch track. Can be a fraction between 0 and 1, pixels, or percent.
///
Expand All @@ -125,7 +125,7 @@ $fluent-switch: extend(
variant: 'fluent',

focus-outline-color: (
color: ('grays', 800)
color: ('grays', 700)
),

border-color: (
Expand All @@ -151,11 +151,11 @@ $fluent-switch: extend(
),

track-on-hover-color:(
color: ('primary', 800)
color: ('primary', 900)
),

border-on-hover-color:(
color: ('primary', 800)
color: ('primary', 900)
),

thumb-on-color: (
Expand Down