Skip to content

Commit 1f1a061

Browse files
author
MPopov
committed
feat(global elevation): Adding global elevation for all components that have elevation.
1 parent 68f865f commit 1f1a061

File tree

4 files changed

+63
-7
lines changed

4 files changed

+63
-7
lines changed

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

Lines changed: 13 additions & 3 deletions
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/themes/_index.scss

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,16 @@
124124
$palette,
125125
$schema,
126126
$border-radius: $roundness,
127+
$shadow: if($elevation == false, 0, null),
127128
));
128129
}
129130

130131
@if not(index($exclude, 'igx-bottom-nav')) {
131-
@include igx-bottom-nav(igx-bottom-nav-theme($palette, $schema));
132+
@include igx-bottom-nav(igx-bottom-nav-theme(
133+
$palette,
134+
$schema,
135+
$shadow: if($elevation == false, 0, null),
136+
));
132137
}
133138

134139
@if not(index($exclude, 'igx-button')) {
@@ -140,14 +145,21 @@
140145
$outlined-border-radius: $roundness,
141146
$fab-border-radius: $roundness,
142147
$icon-border-radius: $roundness,
148+
$raised-resting-shadow: if($elevation == false, 0, null),
149+
$raised-hover-shadow: if($elevation == false, 0, null),
150+
$raised-focus-shadow: if($elevation == false, 0, null),
151+
$fab-resting-shadow: if($elevation == false, 0, null),
152+
$fab-hover-shadow: if($elevation == false, 0, null),
153+
$fab-focus-shadow: if($elevation == false, 0, null),
143154
));
144155
}
145156

146157
@if not(index($exclude, 'igx-button-group')) {
147158
@include igx-button-group(igx-button-group-theme(
148159
$palette,
149160
$schema,
150-
$border-radius: $roundness
161+
$border-radius: $roundness,
162+
$shadow: if($elevation == false, 0, null),
151163
));
152164
}
153165

@@ -183,6 +195,7 @@
183195
$palette,
184196
$schema,
185197
$border-radius: $roundness,
198+
$disable-button-shadow: if($elevation == false, 0, true),
186199
));
187200
}
188201

@@ -200,6 +213,7 @@
200213
$palette,
201214
$schema,
202215
$border-radius: $roundness,
216+
$ghost-shadow: if($elevation == false, 0, null),
203217
));
204218
}
205219

@@ -224,6 +238,7 @@
224238
$palette,
225239
$schema,
226240
$border-radius: $roundness,
241+
$shadow: if($elevation == false, 0, null),
227242
));
228243
}
229244

@@ -236,6 +251,7 @@
236251
$palette,
237252
$schema,
238253
$border-radius: $roundness,
254+
$shadow: if($elevation == false, 0, null),
239255
));
240256
}
241257

@@ -252,6 +268,8 @@
252268
$palette,
253269
$schema,
254270
$drop-area-border-radius: $roundness,
271+
$grid-shadow: if($elevation == false, 0, null),
272+
$drag-shadow: if($elevation == false, 0, null),
255273
));
256274
}
257275

@@ -274,6 +292,9 @@
274292
$box-border-radius: $roundness,
275293
$border-border-radius: $roundness,
276294
$search-border-radius: $roundness,
295+
$search-resting-shadow: if($elevation == false, 0, null),
296+
$search-hover-shadow: if($elevation == false, 0, null),
297+
$search-disabled-shadow: if($elevation == false, 0, null),
277298
));
278299
}
279300

@@ -287,7 +308,11 @@
287308
}
288309

289310
@if not(index($exclude, 'igx-navbar')) {
290-
@include igx-navbar(igx-navbar-theme($palette, $schema));
311+
@include igx-navbar(igx-navbar-theme(
312+
$palette,
313+
$schema,
314+
$shadow: if($elevation == false, 0, null),
315+
));
291316
}
292317

293318
@if not(index($exclude, 'igx-nav-drawer')) {
@@ -296,6 +321,7 @@
296321
$schema,
297322
$border-radius: $roundness,
298323
$item-border-radius: $roundness,
324+
$shadow: if($elevation == false, 0, null),
299325
));
300326
}
301327

@@ -328,6 +354,7 @@
328354
$palette,
329355
$schema,
330356
$border-radius: $roundness,
357+
$shadow: if($elevation == false, 0, null),
331358
));
332359
}
333360

@@ -338,11 +365,18 @@
338365
$border-radius-track: $roundness,
339366
$border-radius-thumb: $roundness,
340367
$border-radius-ripple: $roundness,
368+
$resting-shadow: if($elevation == false, 0, null),
369+
$hover-shadow: if($elevation == false, 0, null),
370+
$disabled-shadow: if($elevation == false, 0, null),
341371
));
342372
}
343373

344374
@if not(index($exclude, 'igx-tabs')) {
345-
@include igx-tabs(igx-tabs-theme($palette, $schema));
375+
@include igx-tabs(igx-tabs-theme(
376+
$palette,
377+
$schema,
378+
$disable-shadow: if($elevation == false, true, false),
379+
));
346380
}
347381

348382
@if not(index($exclude, 'igx-toast')) {
@@ -367,6 +401,8 @@
367401
$schema,
368402
$border-radius: $roundness,
369403
$active-item-border-radius: $roundness,
404+
$modal-shadow: if($elevation == false, 0, null),
405+
$dropdown-shadow: if($elevation == false, 0, null),
370406
));
371407
}
372408
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
////
2+
/// @group schemas
3+
/// @access private
4+
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
5+
////
6+
$_default-elevation-chip: (
7+
ghost-elevation: 8,
8+
);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@import '../elevation/chip';
12
@import '../shape/chip';
23

34
////
@@ -28,6 +29,7 @@
2829
/// @see $default-palette
2930
$_light-chip: extend(
3031
$_default-shape-chip,
32+
$_default-elevation-chip,
3133
(
3234
text-color: (
3335
igx-color: ('grays', 700)

0 commit comments

Comments
 (0)