Skip to content

fix(dropdown): fix typography for boostrap and fluent themes #15037

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 3 commits into from
Nov 12, 2024
Merged

fix(dropdown): fix typography for boostrap and fluent themes #15037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c06965
fix(dropdown): fix typography for boostrap and fluent themes,
desig9stein Nov 11, 2024
cf22060
Merge branch '18.2.x' into igniteui-angular-15004-18-2-x
desig9stein Nov 11, 2024
97256fe
Merge branch '18.2.x' into igniteui-angular-15004-18-2-x
desig9stein Nov 11, 2024
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
14 changes: 10 additions & 4 deletions projects/igniteui-angular/src/lib/core/styles/components/drop-down/_drop-down-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,16 +404,16 @@
}
}

/// Adds typography styles for the igx-list component.
/// Uses the 'caption' and 'subtitle-2'
/// Adds typography styles for the igx-drop-down component.
/// Uses the 'overline', 'body-2', 'subtitle-1'
/// categories from the typographic scale.
/// @group typography
/// @param {Map} $categories [(header: 'overline', item: 'body-2', select-item: 'subtitle-1')] - The categories from the typographic scale used for type styles.
/// @param {Map} $categories [(header: 'overline', item: 'body-2', select-item: 'body-2')] - The categories from the typographic scale used for type styles.
@mixin drop-down-typography(
$categories: (
header: 'overline',
item: 'body-2',
select-item: 'subtitle-1'
select-item: 'body-2'
)
) {
$header: map.get($categories, 'header');
Expand All @@ -432,4 +432,10 @@
margin: 0;
}
}

%igx-drop-down__item--selected {
@include type-style($select-item) {
margin: 0;
}
}
}
6 changes: 3 additions & 3 deletions projects/igniteui-angular/src/lib/core/styles/typography/_bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
));
@include dock-manager-typography();
@include drop-down-typography($categories: (
header: 'body-1',
item: 'body-1',
select-item: 'body-1'
header: 'overline',
item: 'body-2',
select-item: 'body-2'
));
@include expansion-panel-typography($categories: (
title: 'h5',
Expand Down
6 changes: 5 additions & 1 deletion projects/igniteui-angular/src/lib/core/styles/typography/_fluent.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@
@include date-range-typography();
@include dialog-typography();
@include dock-manager-typography();
@include drop-down-typography();
@include drop-down-typography($categories: (
header: 'subtitle-2',
item: 'body-2',
select-item: 'body-2'
));
@include expansion-panel-typography($categories: (
title: 'subtitle-1',
description: 'body-2',
Expand Down
Loading