Skip to content

Commit 63e76ef

Browse files
authored
Merge branch '18.2.x' into ganastasov/fix-15019-18.2.x
2 parents db4b9dc + 90b3403 commit 63e76ef

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

projects/igniteui-angular/src/lib/core/styles/components/drop-down/_drop-down-theme.scss

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -404,16 +404,16 @@
404404
}
405405
}
406406

407-
/// Adds typography styles for the igx-list component.
408-
/// Uses the 'caption' and 'subtitle-2'
407+
/// Adds typography styles for the igx-drop-down component.
408+
/// Uses the 'overline', 'body-2', 'subtitle-1'
409409
/// categories from the typographic scale.
410410
/// @group typography
411-
/// @param {Map} $categories [(header: 'overline', item: 'body-2', select-item: 'subtitle-1')] - The categories from the typographic scale used for type styles.
411+
/// @param {Map} $categories [(header: 'overline', item: 'body-2', select-item: 'body-2')] - The categories from the typographic scale used for type styles.
412412
@mixin drop-down-typography(
413413
$categories: (
414414
header: 'overline',
415415
item: 'body-2',
416-
select-item: 'subtitle-1'
416+
select-item: 'body-2'
417417
)
418418
) {
419419
$header: map.get($categories, 'header');
@@ -432,4 +432,10 @@
432432
margin: 0;
433433
}
434434
}
435+
436+
%igx-drop-down__item--selected {
437+
@include type-style($select-item) {
438+
margin: 0;
439+
}
440+
}
435441
}

projects/igniteui-angular/src/lib/core/styles/typography/_bootstrap.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
));
6565
@include dock-manager-typography();
6666
@include drop-down-typography($categories: (
67-
header: 'body-1',
68-
item: 'body-1',
69-
select-item: 'body-1'
67+
header: 'overline',
68+
item: 'body-2',
69+
select-item: 'body-2'
7070
));
7171
@include expansion-panel-typography($categories: (
7272
title: 'h5',

projects/igniteui-angular/src/lib/core/styles/typography/_fluent.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@
6363
@include date-range-typography();
6464
@include dialog-typography();
6565
@include dock-manager-typography();
66-
@include drop-down-typography();
66+
@include drop-down-typography($categories: (
67+
header: 'subtitle-2',
68+
item: 'body-2',
69+
select-item: 'body-2'
70+
));
6771
@include expansion-panel-typography($categories: (
6872
title: 'subtitle-1',
6973
description: 'body-2',

0 commit comments

Comments
 (0)