Skip to content

Commit fd40ed4

Browse files
authored
Merge pull request #5549 from IgniteUI/globar-roundness
feat(themes): add global elevation and roundess params
2 parents f6d1464 + 71d15bb commit fd40ed4

File tree

6 files changed

+209
-39
lines changed

6 files changed

+209
-39
lines changed

projects/igniteui-angular/src/lib/core/styles/components/chip/_chip-theme.scss

+13-3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
@function igx-chip-theme(
4343
$palette: $default-palette,
4444
$schema: $light-schema,
45+
$elevations: $elevations,
4546
$border-radius: null,
4647
4748
$text-color: null,
@@ -67,7 +68,9 @@
6768
6869
$focus-selected-text-color: null,
6970
$focus-selected-background: null,
70-
$focus-selected-border-color: null
71+
$focus-selected-border-color: null,
72+
73+
$ghost-shadow: null,
7174
) {
7275
$name: 'igx-chip';
7376
$chip-schema: map-get($schema, $name);
@@ -165,6 +168,11 @@
165168
$focus-selected-border-color: $border-color;
166169
}
167170

171+
@if not($ghost-shadow) {
172+
$ghost-elevation: map-get($chip-schema, 'ghost-elevation');
173+
$ghost-shadow: igx-elevation($elevations, $ghost-elevation);
174+
}
175+
168176
@return extend($theme, (
169177
name: $name,
170178
palette: $palette,
@@ -193,7 +201,9 @@
193201

194202
focus-selected-text-color: $focus-selected-text-color,
195203
focus-selected-background: $focus-selected-background,
196-
focus-selected-border-color: $focus-selected-border-color
204+
focus-selected-border-color: $focus-selected-border-color,
205+
206+
ghost-shadow: $ghost-shadow,
197207
));
198208
}
199209

@@ -486,7 +496,7 @@
486496
%igx-chip__ghost {
487497
position: absolute;
488498
z-index: 10;
489-
box-shadow: igx-elevation($elevations, 8);
499+
box-shadow: --var($theme, 'ghost-shadow');
490500
overflow: hidden;
491501
background: --var($theme, 'ghost-background');
492502

projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
/// @param {Color} $item-hover-text-color [null] - The item's hover text color.
2222
/// @param {Color} $item-hover-icon-color [null] - The item's hover icon color.
2323
/// @param {Color} $shadow [null] - Sets a custom shadow to be used by the drawer.
24-
/// @param {border-radius} border-radius [null] - The border radius used for the navdrawer.
25-
/// @param {border-radius} item-border-radius [null] - The border radius used for the navdrawer item.
24+
/// @param {border-radius} $border-radius [null] - The border radius used for the navdrawer.
25+
/// @param {border-radius} $item-border-radius [null] - The border radius used for the navdrawer item.
2626
///
2727
/// @requires $default-palette
2828
/// @requires $light-schema

projects/igniteui-angular/src/lib/core/styles/components/switch/_switch-theme.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
/// @param {box-shadow} $hover-shadow [null] - The shadow used for the thumb in hover state of the switch.
2525
/// @param {box-shadow} $disabled-shadow [null] - The shadow used for the thumb in disable state of the switch.
2626
///
27-
/// @param {border-radius} border-radius-track [null] - The border radius used for switch track.
28-
/// @param {border-radius} border-radius-thumb [null] - The border radius used for switch thumb.
29-
/// @param {border-radius} border-radius-ripple [null] - The border radius used for switch ripple.
27+
/// @param {border-radius} $border-radius-track [null] - The border radius used for switch track.
28+
/// @param {border-radius} $border-radius-thumb [null] - The border radius used for switch thumb.
29+
/// @param {border-radius} $border-radius-ripple [null] - The border radius used for switch ripple.
3030
///
3131
/// @requires $default-palette
3232
/// @requires $light-schema

0 commit comments

Comments
 (0)