Skip to content

Commit ce48e00

Browse files
authored
fix(dialog): fix dialog discrepancies whit the UI kit (#15034)
1 parent 3647a95 commit ce48e00

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

projects/igniteui-angular/src/lib/core/styles/components/dialog/_dialog-theme.scss

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
@include css-vars($theme);
8888

8989
$variant: map.get($theme, '_meta', 'variant');
90-
$bootstrap-theme: map.get($theme, variant) == 'bootstrap';
90+
$bootstrap-theme: map.get($theme, '_meta', 'variant') == 'bootstrap';
9191

9292
$dialog-min-width: map.get((
9393
material: rem(280px),
@@ -96,21 +96,21 @@
9696
), $variant);
9797

9898
$dialog-title-padding: map.get((
99-
material: rem(24px) rem(24px) rem(12px) rem(24px),
99+
material: rem(16px) rem(24px) rem(0px) rem(24px),
100100
fluent: rem(16px) rem(24px) rem(24px) rem(24px),
101101
bootstrap: rem(16px),
102102
indigo-design: rem(24px) rem(24px) 0 rem(24px),
103103
), $variant);
104104

105105
$dialog-message-padding: map.get((
106-
material: rem(12px) rem(24px),
106+
material: rem(14px) rem(24px),
107107
fluent: 0 rem(24px) rem(20px) rem(24px),
108108
bootstrap: rem(16px),
109109
indigo-design: rem(16px) rem(24px),
110110
), $variant);
111111

112112
$dialog-actions-padding: map.get((
113-
material: rem(8px),
113+
material: 0 rem(8px) rem(8px),
114114
fluent: 0 rem(24px) rem(24px) rem(24px),
115115
bootstrap: rem(16px),
116116
indigo-design: rem(16px) rem(24px) rem(24px) rem(24px),
@@ -180,23 +180,16 @@
180180
flex-flow: row nowrap;
181181
justify-content: flex-end;
182182
padding: $dialog-actions-padding;
183+
gap: if($variant == 'indigo-design', rem(16px), rem(8px));
183184

184185
@if $bootstrap-theme {
185186
border-top: rem(1px) solid var-get($theme, 'border-color');
186187
}
187188

188-
button + button {
189-
margin-inline-start: rem(8px);
190-
}
191-
192189
@if $variant == 'indigo-design' {
193190
.igx-button {
194191
--ig-size: 2;
195192
}
196-
197-
button + button {
198-
margin-inline-start: rem(16px);
199-
}
200193
}
201194
}
202195
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@
6060
));
6161
@include column-actions-typography();
6262
@include date-range-typography();
63-
@include dialog-typography();
63+
@include dialog-typography($categories: (
64+
title: 'h6',
65+
content: 'body-2'
66+
));
6467
@include dock-manager-typography();
6568
@include drop-down-typography($categories: (
6669
header: 'subtitle-2',

0 commit comments

Comments
 (0)