Skip to content

Commit 3757e20

Browse files
desig9steinStefan Ivanovsimeonoff
authored
Update Bootstrap typography (#10908)
* feat(typography): Update bootstrap typography to match the UI kit * feat(typography): Update bootstrap typography. * feat(typography): Update h6 font-weight in bootstrap. * Update projects/igniteui-angular/src/lib/core/styles/typography/scale-presets/_bootstrap.scss Co-authored-by: Stefan Ivanov <[email protected]> * Update projects/igniteui-angular/src/lib/core/styles/typography/scale-presets/_bootstrap.scss Co-authored-by: Stefan Ivanov <[email protected]> * Update projects/igniteui-angular/src/lib/core/styles/typography/scale-presets/_bootstrap.scss Co-authored-by: Stefan Ivanov <[email protected]> * Update projects/igniteui-angular/src/lib/core/styles/typography/scale-presets/_bootstrap.scss Co-authored-by: Stefan Ivanov <[email protected]> * Update projects/igniteui-angular/src/lib/core/styles/typography/scale-presets/_bootstrap.scss Co-authored-by: Stefan Ivanov <[email protected]> * Update projects/igniteui-angular/src/lib/core/styles/typography/_typography.scss Co-authored-by: Stefan Ivanov <[email protected]> * Update projects/igniteui-angular/src/lib/core/styles/typography/_typography.scss Co-authored-by: Stefan Ivanov <[email protected]> * Update projects/igniteui-angular/src/lib/core/styles/typography/_typography.scss Co-authored-by: Stefan Ivanov <[email protected]> Co-authored-by: Stefan Ivanov <[email protected]> Co-authored-by: Simeon Simeonoff <[email protected]>
1 parent e62aeae commit 3757e20

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

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

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@
182182

183183
@include igx-dialog-typography($type-scale, $categories: (
184184
title: 'h5',
185-
content: 'body-1',
186185
));
187186

188187
@include igx-drop-down-typography($type-scale, $categories: (
@@ -197,6 +196,29 @@
197196
subtitle: 'subtitle-1',
198197
header: 'overline',
199198
));
199+
200+
@include igx-checkbox-typography($type-scale, $categories: (
201+
label: 'body-2',
202+
));
203+
204+
@include igx-input-group-typography($type-scale, $categories: (
205+
helper-text: 'body-2',
206+
input-text: 'body-1'
207+
));
208+
209+
@include igx-navbar-typography($type-scale, $categories: (
210+
title: 'h5'
211+
));
212+
213+
@include igx-drop-down-typography($type-scale, $categories: (
214+
header: 'body-1',
215+
item: 'body-1',
216+
select-item: 'body-1'
217+
));
218+
219+
@include igx-expansion-panel-typography($type-scale, $categories: (
220+
description: 'body-1',
221+
));
200222
}
201223

202224
@if ($_variant == 'indigo') {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ $bootstrap_h5: igx-type-style(
4848

4949
$bootstrap_h6: igx-type-style(
5050
$font-size: rem(16px),
51-
$font-weight: 400,
51+
$font-weight: 500,
5252
$line-height: rem(19.2px),
5353
$text-transform: none,
5454
$margin-top: 0,
@@ -95,7 +95,7 @@ $bootstrap_button: igx-type-style(
9595
$font-size: rem(16px),
9696
$font-weight: 500,
9797
$line-height: rem(24px),
98-
$text-transform: capitalize,
98+
$text-transform: none,
9999
$margin-top: 0,
100100
$margin-bottom: 0
101101
);

0 commit comments

Comments
 (0)