diff --git a/README.md b/README.md index 3480315c..8192368a 100644 --- a/README.md +++ b/README.md @@ -38,8 +38,8 @@ UI kit использует следующие виды шрифтов. | Тип шрифта | Используемые начертания | Рекомендуемый шрифт | Рекомендуемый аналог | | ----------- | ---------------------------------------------- | ------------------- | -------------------- | -| `primary` | – regular
– demibold
– demibold italic | TT Fellows | PT Sans | -| `secondary` | – regular
– bold | PT Sans | — | +| `primary` | – regular
– demibold
– demibold italic | TT Fellows | Noto Sans | +| `secondary` | – regular
– medium
– bold | Noto Sans | — | Исходники шрифтов не поставляются вместе с пакетом, их требуется подключать отдельно. После подключения шрифтов в проект, необходимо указать их в @@ -84,10 +84,11 @@ UI kit использует следующие виды шрифтов. ], }, { - fontFamily: 'PT Sans', + fontFamily: 'Noto Sans', fontDefinitions: [ - { path: './assets/fonts/PTSans-Bold.ttf', weight: 700 }, - { path: './assets/fonts/PTSans-Regular.ttf', weight: 400 }, + { path: './assets/NotoSans-Bold.ttf', weight: 700 }, + { path: './assets/NotoSans-Medium.ttf', weight: 500 }, + { path: './assets/NotoSans-Regular.ttf', weight: 400 }, ], }, ], @@ -104,19 +105,20 @@ UI kit использует следующие виды шрифтов. 2. Создать XML-ресурс для каждого шрифта ```xml - + - - + + + ``` ```xml - - - + + + ``` @@ -130,7 +132,7 @@ UI kit использует следующие виды шрифтов. //подключение шрифтов ReactFontManager.getInstance().addCustomFont(this, "TT Fellows", R.font.xml_tt_fellows) - ReactFontManager.getInstance().addCustomFont(this, "PT Sans", R.font.xml_pt_sans) + ReactFontManager.getInstance().addCustomFont(this, "Noto Sans", R.font.xml_noto_sans) // остальной код... } @@ -152,11 +154,12 @@ UI kit использует следующие виды шрифтов. ```xml UIAppFonts - TTFellows-DemiBold.ttf - TTFellows-DemiBoldItalic.ttf - TTFellows-Regular.ttf - PTSans-Bold.ttf - PTSans-Regular.ttf + TTFellows-DemiBold.ttf + TTFellows-DemiBoldItalic.ttf + TTFellows-Regular.ttf + NotoSans-Regular.ttf + NotoSans-Medium.ttf + NotoSans-Bold.ttf ``` diff --git a/src/components/Accordion/__tests__/__snapshots__/Accordion.test.tsx.snap b/src/components/Accordion/__tests__/__snapshots__/Accordion.test.tsx.snap index 2201ec20..04669b17 100644 --- a/src/components/Accordion/__tests__/__snapshots__/Accordion.test.tsx.snap +++ b/src/components/Accordion/__tests__/__snapshots__/Accordion.test.tsx.snap @@ -279,7 +279,7 @@ exports[`Accordion Header elements maximal 1`] = ` style={ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 15.75, "fontWeight": 700, "includeFontPadding": false, @@ -707,7 +707,7 @@ exports[`Accordion Header elements minimal 1`] = ` style={ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 15.75, "fontWeight": 700, "includeFontPadding": false, diff --git a/src/components/Avatar/__tests__/__snapshots__/Avatar.test.tsx.snap b/src/components/Avatar/__tests__/__snapshots__/Avatar.test.tsx.snap index 5aae92ff..81e73a20 100644 --- a/src/components/Avatar/__tests__/__snapshots__/Avatar.test.tsx.snap +++ b/src/components/Avatar/__tests__/__snapshots__/Avatar.test.tsx.snap @@ -363,7 +363,7 @@ exports[`Avatar component tests Size: large, shape: circle, type: label 1`] = ` style={ { "color": "#000000", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "textTransform": "uppercase", @@ -597,7 +597,7 @@ exports[`Avatar component tests Size: large, shape: square, type: label 1`] = ` style={ { "color": "#000000", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "textTransform": "uppercase", @@ -837,7 +837,7 @@ exports[`Avatar component tests Size: normal, shape: circle, type: label 1`] = ` style={ { "color": "#000000", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "textTransform": "uppercase", @@ -1071,7 +1071,7 @@ exports[`Avatar component tests Size: normal, shape: square, type: label 1`] = ` style={ { "color": "#000000", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "textTransform": "uppercase", @@ -1311,7 +1311,7 @@ exports[`Avatar component tests Size: xlarge, shape: circle, type: label 1`] = ` style={ { "color": "#000000", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "textTransform": "uppercase", @@ -1545,7 +1545,7 @@ exports[`Avatar component tests Size: xlarge, shape: square, type: label 1`] = ` style={ { "color": "#000000", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "textTransform": "uppercase", @@ -1598,7 +1598,7 @@ exports[`Avatar component tests With badge, showBadge: false 1`] = ` style={ { "color": "#000000", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "textTransform": "uppercase", @@ -1651,7 +1651,7 @@ exports[`Avatar component tests With badge, showBadge: true 1`] = ` style={ { "color": "#000000", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "textTransform": "uppercase", diff --git a/src/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap b/src/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap index 40c37e8c..d7fe5652 100644 --- a/src/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap +++ b/src/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap @@ -64,7 +64,7 @@ exports[`Chip component tests { [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -244,7 +244,7 @@ exports[`Chip component tests { [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -322,7 +322,7 @@ exports[`Chip component tests { [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -637,7 +637,7 @@ exports[`Chip component tests { [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -850,7 +850,7 @@ exports[`Chip component tests { [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -928,7 +928,7 @@ exports[`Chip component tests { [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -1006,7 +1006,7 @@ exports[`Chip component tests { [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -1219,7 +1219,7 @@ exports[`Chip component tests { [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -1432,7 +1432,7 @@ exports[`Chip component tests { [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -1612,7 +1612,7 @@ exports[`Chip component tests { [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -1690,7 +1690,7 @@ exports[`Chip component tests { [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -2005,7 +2005,7 @@ exports[`Chip component tests { [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -2218,7 +2218,7 @@ exports[`Chip component tests { [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -2296,7 +2296,7 @@ exports[`Chip component tests { [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -2374,7 +2374,7 @@ exports[`Chip component tests { [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -2587,7 +2587,7 @@ exports[`Chip component tests { [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", diff --git a/src/components/Dialog/__tests__/__snapshots__/DialogHeader.test.tsx.snap b/src/components/Dialog/__tests__/__snapshots__/DialogHeader.test.tsx.snap index 793348ec..5bc35562 100644 --- a/src/components/Dialog/__tests__/__snapshots__/DialogHeader.test.tsx.snap +++ b/src/components/Dialog/__tests__/__snapshots__/DialogHeader.test.tsx.snap @@ -126,7 +126,7 @@ exports[`DialogHeader {"onClose": [Function mockConstructor], "severity": "dange "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -437,7 +437,7 @@ exports[`DialogHeader {"onClose": [Function mockConstructor], "severity": "help" "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -748,7 +748,7 @@ exports[`DialogHeader {"onClose": [Function mockConstructor], "severity": "info" "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -1036,7 +1036,7 @@ exports[`DialogHeader {"onClose": [Function mockConstructor], "severity": "succe "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -1347,7 +1347,7 @@ exports[`DialogHeader {"onClose": [Function mockConstructor], "severity": "warni "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -1533,7 +1533,7 @@ exports[`DialogHeader {"onClose": [Function mockConstructor], "severity": undefi "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -1821,7 +1821,7 @@ exports[`DialogHeader {"onClose": undefined, "severity": "danger", "title": "Dia "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -1993,7 +1993,7 @@ exports[`DialogHeader {"onClose": undefined, "severity": "help", "title": "Dialo "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -2165,7 +2165,7 @@ exports[`DialogHeader {"onClose": undefined, "severity": "info", "title": "Dialo "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -2314,7 +2314,7 @@ exports[`DialogHeader {"onClose": undefined, "severity": "success", "title": "Di "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -2486,7 +2486,7 @@ exports[`DialogHeader {"onClose": undefined, "severity": "warning", "title": "Di "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -2533,7 +2533,7 @@ exports[`DialogHeader {"onClose": undefined, "severity": undefined, "title": "Di "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, diff --git a/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap b/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap index 2abd3a4f..59628323 100644 --- a/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap +++ b/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap @@ -116,9 +116,10 @@ exports[`Divider {"Icon": [Object], "align": "end", "layout": "horizontal", "sho style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { @@ -368,9 +369,10 @@ exports[`Divider {"Icon": [Object], "align": "end", "layout": "vertical", "text" style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { diff --git a/src/components/Input/__tests__/__snapshots__/InputGroupAddon.test.tsx.snap b/src/components/Input/__tests__/__snapshots__/InputGroupAddon.test.tsx.snap index 0611e854..e751df44 100644 --- a/src/components/Input/__tests__/__snapshots__/InputGroupAddon.test.tsx.snap +++ b/src/components/Input/__tests__/__snapshots__/InputGroupAddon.test.tsx.snap @@ -157,7 +157,7 @@ exports[`InputGroup component tests content: string, position: left 1`] = ` style={ { "color": "#85888e", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -198,7 +198,7 @@ exports[`InputGroup component tests disabled: false 1`] = ` style={ { "color": "#85888e", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", @@ -242,7 +242,7 @@ exports[`InputGroup component tests disabled: true 1`] = ` style={ { "color": "#85888e", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", diff --git a/src/components/Input/__tests__/__snapshots__/InputTextBase.test.tsx.snap b/src/components/Input/__tests__/__snapshots__/InputTextBase.test.tsx.snap index 0b9f8fbd..5474ef25 100644 --- a/src/components/Input/__tests__/__snapshots__/InputTextBase.test.tsx.snap +++ b/src/components/Input/__tests__/__snapshots__/InputTextBase.test.tsx.snap @@ -16,7 +16,7 @@ exports[`InputTextBase component functionality tests should pass args to custom "style": [ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", diff --git a/src/components/List/Base/__tests__/__snapshots__/ListBase.test.tsx.snap b/src/components/List/Base/__tests__/__snapshots__/ListBase.test.tsx.snap index 3ab63c75..5a316526 100644 --- a/src/components/List/Base/__tests__/__snapshots__/ListBase.test.tsx.snap +++ b/src/components/List/Base/__tests__/__snapshots__/ListBase.test.tsx.snap @@ -280,9 +280,10 @@ exports[`ListBase tests ListBase centered and full divider 1`] = ` style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { @@ -307,9 +308,11 @@ exports[`ListBase tests ListBase centered and full divider 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -332,9 +335,11 @@ exports[`ListBase tests ListBase centered and full divider 1`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -831,9 +836,10 @@ exports[`ListBase tests ListBase full disabled 1`] = ` style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { @@ -858,9 +864,11 @@ exports[`ListBase tests ListBase full disabled 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -883,9 +891,11 @@ exports[`ListBase tests ListBase full disabled 1`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -1389,9 +1399,10 @@ exports[`ListBase tests ListBase maximal config 1`] = ` style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { @@ -1416,9 +1427,11 @@ exports[`ListBase tests ListBase maximal config 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1441,9 +1454,11 @@ exports[`ListBase tests ListBase maximal config 1`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -1747,9 +1762,11 @@ exports[`ListBase tests ListBase minimal config 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { diff --git a/src/components/MenuItem/Template/__tests__/__snapshots__/MenuItemTemplate.test.tsx.snap b/src/components/MenuItem/Template/__tests__/__snapshots__/MenuItemTemplate.test.tsx.snap index 9f3532fc..9a2d895e 100644 --- a/src/components/MenuItem/Template/__tests__/__snapshots__/MenuItemTemplate.test.tsx.snap +++ b/src/components/MenuItem/Template/__tests__/__snapshots__/MenuItemTemplate.test.tsx.snap @@ -241,9 +241,11 @@ exports[`MenuItemTemplate tests MenuItemTemplate full disabled 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -253,7 +255,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate full disabled 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, undefined, undefined, @@ -268,9 +271,11 @@ exports[`MenuItemTemplate tests MenuItemTemplate full disabled 1`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -604,9 +609,11 @@ exports[`MenuItemTemplate tests MenuItemTemplate minimal config 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -616,7 +623,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate minimal config 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, undefined, undefined, @@ -804,9 +812,11 @@ exports[`MenuItemTemplate tests MenuItemTemplate prefix,suffix = right 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -816,7 +826,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate prefix,suffix = right 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, undefined, undefined, @@ -831,9 +842,11 @@ exports[`MenuItemTemplate tests MenuItemTemplate prefix,suffix = right 1`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -1138,9 +1151,11 @@ exports[`MenuItemTemplate tests MenuItemTemplate with colored icon 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1150,7 +1165,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate with colored icon 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, undefined, undefined, @@ -1251,9 +1267,11 @@ exports[`MenuItemTemplate tests MenuItemTemplate with extra 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1263,7 +1281,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate with extra 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, undefined, undefined, @@ -1573,9 +1592,11 @@ exports[`MenuItemTemplate tests MenuItemTemplate with icon 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1585,7 +1606,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate with icon 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, undefined, undefined, @@ -1834,9 +1856,11 @@ exports[`MenuItemTemplate tests MenuItemTemplate with icon and badge 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1846,7 +1870,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate with icon and badge 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, undefined, undefined, @@ -1950,9 +1975,11 @@ exports[`MenuItemTemplate tests MenuItemTemplate with padding 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1962,7 +1989,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate with padding 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, undefined, undefined, @@ -2069,9 +2097,11 @@ exports[`MenuItemTemplate tests MenuItemTemplate with separator 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -2081,7 +2111,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate with separator 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, undefined, undefined, diff --git a/src/components/Timer/__tests__/__snapshots__/Timer.test.tsx.snap b/src/components/Timer/__tests__/__snapshots__/Timer.test.tsx.snap index cf7b9813..f5235f08 100644 --- a/src/components/Timer/__tests__/__snapshots__/Timer.test.tsx.snap +++ b/src/components/Timer/__tests__/__snapshots__/Timer.test.tsx.snap @@ -157,7 +157,7 @@ exports[`Timer should reset timer on changing countFrom prop: after 1 s 1`] = ` style={ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "fontWeight": 700, "includeFontPadding": false, @@ -222,7 +222,7 @@ exports[`Timer should reset timer on changing countFrom prop: after 1 s 1`] = ` style={ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "fontWeight": 700, "includeFontPadding": false, @@ -394,7 +394,7 @@ exports[`Timer should reset timer on changing countFrom prop: after reset 1`] = style={ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "fontWeight": 700, "includeFontPadding": false, @@ -459,7 +459,7 @@ exports[`Timer should reset timer on changing countFrom prop: after reset 1`] = style={ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "fontWeight": 700, "includeFontPadding": false, @@ -631,7 +631,7 @@ exports[`Timer snapshot: before start 1`] = ` style={ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "fontWeight": 700, "includeFontPadding": false, @@ -696,7 +696,7 @@ exports[`Timer snapshot: before start 1`] = ` style={ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "fontWeight": 700, "includeFontPadding": false, @@ -868,7 +868,7 @@ exports[`Timer snapshot: on finish 1`] = ` style={ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "fontWeight": 700, "includeFontPadding": false, @@ -933,7 +933,7 @@ exports[`Timer snapshot: on finish 1`] = ` style={ { "color": "#181a1f", - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, "fontWeight": 700, "includeFontPadding": false, diff --git a/src/components/Typography/Anchor.tsx b/src/components/Typography/Anchor.tsx index 431d8907..535f30a1 100644 --- a/src/components/Typography/Anchor.tsx +++ b/src/components/Typography/Anchor.tsx @@ -141,10 +141,12 @@ const styles = StyleSheet.create(({ spacing, typography, fonts }) => ({ includeFontPadding: false, verticalAlign: 'middle', color: typography.Color.Service['text-info'], - fontFamily: fonts.primary, + fontFamily: fonts.secondary, + lineHeight: 15, + letterSpacing: -0.25, }, underlined: { textDecorationLine: 'underline' }, - base: { fontSize: typography.Size['text-base'], fontFamily: fonts.secondary }, + base: { lineHeight: 18, letterSpacing: 0 }, visited: { color: typography.Color.Service['text-help'] }, icon: { width: typography.Size['text-base'], diff --git a/src/components/Typography/Body.tsx b/src/components/Typography/Body.tsx index a988db0a..9ad101d5 100644 --- a/src/components/Typography/Body.tsx +++ b/src/components/Typography/Body.tsx @@ -38,10 +38,12 @@ export const Body = ({ const styles = StyleSheet.create(({ theme, typography, fonts }) => ({ text: { - fontSize: typography.Size['text-lg'], + fontSize: typography.Size['text-base'], includeFontPadding: false, verticalAlign: 'middle', fontFamily: fonts.secondary, + lineHeight: 20, + letterSpacing: -0.5, }, regular: { fontWeight: 400 }, medium: { fontWeight: 500 }, @@ -49,8 +51,8 @@ const styles = StyleSheet.create(({ theme, typography, fonts }) => ({ default: { color: theme.General.textColor }, primary: { color: theme.General.primaryColor }, secondary: { color: theme.General.textSecondaryColor }, - base: { fontSize: typography.Size['text-base'] }, - paragraph: { fontSize: typography.Size['text-lg'] }, - paragraphBase: { fontSize: typography.Size['text-base'] }, + base: { fontSize: typography.Size['text-sm'], lineHeight: 18 }, + paragraph: { lineHeight: 24 }, + paragraphBase: { lineHeight: 21 }, disabled: { opacity: 0.6 }, })) diff --git a/src/components/Typography/Caption.tsx b/src/components/Typography/Caption.tsx index 33bfa9f6..7795843a 100644 --- a/src/components/Typography/Caption.tsx +++ b/src/components/Typography/Caption.tsx @@ -62,7 +62,9 @@ const styles = StyleSheet.create(({ theme, spacing, typography, fonts }) => ({ fontSize: typography.Size['text-sm'], includeFontPadding: false, verticalAlign: 'middle', - fontFamily: fonts.primary, + fontFamily: fonts.secondary, + lineHeight: 15, + letterSpacing: -0.25, }, textWithIcon: { flexShrink: 1 }, default: { color: theme.General.textColor }, diff --git a/src/components/Typography/Service.tsx b/src/components/Typography/Service.tsx index 2fbfbd4d..75ba9fa5 100644 --- a/src/components/Typography/Service.tsx +++ b/src/components/Typography/Service.tsx @@ -56,7 +56,7 @@ export const Service = ({ iconSize: base ? styles.iconBase : styles.icon, textStyles: [ styles.textCommon, - base ? styles.textBase : styles.text, + base && styles.textBase, iconMap[variant]?.style || styles.info, ], containerStyle: base ? styles.containerBase : styles.container, @@ -103,12 +103,12 @@ const styles = StyleSheet.create(({ typography, spacing, fonts }) => ({ verticalAlign: 'middle', flexShrink: 1, fontWeight: 400, - }, - textBase: { - fontSize: typography.Size['text-base'], + fontSize: typography.Size['text-sm'], fontFamily: fonts.secondary, + lineHeight: 15, + letterSpacing: -0.25, }, - text: { fontSize: typography.Size['text-sm'], fontFamily: fonts.primary }, + textBase: { lineHeight: 18 }, warning: { color: typography.Color.Service['text-warning'] }, success: { color: typography.Color.Service['text-success'] }, diff --git a/src/components/Typography/Subtitle.tsx b/src/components/Typography/Subtitle.tsx index 9b9e29bb..99ff640b 100644 --- a/src/components/Typography/Subtitle.tsx +++ b/src/components/Typography/Subtitle.tsx @@ -32,12 +32,13 @@ export const Subtitle = memo( const styles = StyleSheet.create(({ theme, typography, fonts }) => ({ text: { - fontSize: typography.Size['text-sm'], + fontSize: typography.Size['text-xs'], fontWeight: 700, textTransform: 'uppercase', - fontFamily: fonts.primary, + fontFamily: fonts.secondary, + lineHeight: 15, }, - base: { fontSize: typography.Size['text-base'], fontFamily: fonts.secondary }, + base: { lineHeight: 18, fontSize: typography.Size['text-sm'] }, default: { color: theme.General.textColor }, primary: { color: theme.General.primaryColor }, secondary: { color: theme.General.textSecondaryColor }, diff --git a/src/components/Typography/Title.tsx b/src/components/Typography/Title.tsx index 41b44c8f..de6dd6d0 100644 --- a/src/components/Typography/Title.tsx +++ b/src/components/Typography/Title.tsx @@ -18,13 +18,13 @@ const styles = StyleSheet.create(({ theme, typography, fonts }) => ({ includeFontPadding: false, verticalAlign: 'middle', }, - d1: { fontSize: typography.Size['text-6xl'] }, - d2: { fontSize: typography.Size['text-5xl'] }, - d3: { fontSize: typography.Size['text-4xl'] }, - h1: { fontSize: typography.Size['text-3xl'] }, - h2: { fontSize: typography.Size['text-2xl'] }, - h3: { fontSize: typography.Size['text-xl'] }, - h4: { fontSize: typography.Size['text-lg'] }, - h5: { fontSize: typography.Size['text-base'] }, - h6: { fontSize: typography.Size['text-sm'] }, + d1: { fontSize: typography.Size['text-5xl'] }, + d2: { fontSize: typography.Size['text-4xl'] }, + d3: { fontSize: typography.Size['text-3xl'] }, + h1: { fontSize: typography.Size['text-2xl'] }, + h2: { fontSize: typography.Size['text-xl'] }, + h3: { fontSize: typography.Size['text-lg'] }, + h4: { fontSize: typography.Size['text-base'] }, + h5: { fontSize: typography.Size['text-sm'] }, + h6: { fontSize: typography.Size['text-xs'] }, })) diff --git a/src/components/Typography/__tests__/__snapshots__/Anchor.test.tsx.snap b/src/components/Typography/__tests__/__snapshots__/Anchor.test.tsx.snap index 8d73d362..b2b21e6a 100644 --- a/src/components/Typography/__tests__/__snapshots__/Anchor.test.tsx.snap +++ b/src/components/Typography/__tests__/__snapshots__/Anchor.test.tsx.snap @@ -19,9 +19,11 @@ exports[`Body component tests default props 1`] = ` { "color": "#1e76cd", "flexShrink": 1, - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, false, @@ -220,15 +222,17 @@ exports[`Body component tests левая иконка, base, visited, testID = C { "color": "#1e76cd", "flexShrink": 1, - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, false, { - "fontFamily": "PT Sans", - "fontSize": 14, + "letterSpacing": 0, + "lineHeight": 18, }, { "color": "#9457ea", @@ -427,9 +431,11 @@ exports[`Body component tests левая иконка, правая иконка { "color": "#1e76cd", "flexShrink": 1, - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, false, @@ -622,9 +628,11 @@ exports[`Body component tests правая иконка, noWrapper 1`] = ` { "color": "#1e76cd", "flexShrink": 1, - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, false, diff --git a/src/components/Typography/__tests__/__snapshots__/Body.test.tsx.snap b/src/components/Typography/__tests__/__snapshots__/Body.test.tsx.snap index 2b990010..93d9b128 100644 --- a/src/components/Typography/__tests__/__snapshots__/Body.test.tsx.snap +++ b/src/components/Typography/__tests__/__snapshots__/Body.test.tsx.snap @@ -5,9 +5,11 @@ exports[`Body component tests base = false, color = default, disabled = false, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -33,9 +35,11 @@ exports[`Body component tests base = false, color = default, disabled = false, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -61,9 +65,11 @@ exports[`Body component tests base = false, color = default, disabled = false, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -89,9 +95,11 @@ exports[`Body component tests base = false, color = default, disabled = false, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -102,7 +110,7 @@ exports[`Body component tests base = false, color = default, disabled = false, p }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -119,9 +127,11 @@ exports[`Body component tests base = false, color = default, disabled = false, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -132,7 +142,7 @@ exports[`Body component tests base = false, color = default, disabled = false, p }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -149,9 +159,11 @@ exports[`Body component tests base = false, color = default, disabled = false, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -162,7 +174,7 @@ exports[`Body component tests base = false, color = default, disabled = false, p }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -179,9 +191,11 @@ exports[`Body component tests base = false, color = default, disabled = true, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -209,9 +223,11 @@ exports[`Body component tests base = false, color = default, disabled = true, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -239,9 +255,11 @@ exports[`Body component tests base = false, color = default, disabled = true, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -269,9 +287,11 @@ exports[`Body component tests base = false, color = default, disabled = true, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -282,7 +302,7 @@ exports[`Body component tests base = false, color = default, disabled = true, pa }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -301,9 +321,11 @@ exports[`Body component tests base = false, color = default, disabled = true, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -314,7 +336,7 @@ exports[`Body component tests base = false, color = default, disabled = true, pa }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -333,9 +355,11 @@ exports[`Body component tests base = false, color = default, disabled = true, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -346,7 +370,7 @@ exports[`Body component tests base = false, color = default, disabled = true, pa }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -365,9 +389,11 @@ exports[`Body component tests base = false, color = primary, disabled = false, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -393,9 +419,11 @@ exports[`Body component tests base = false, color = primary, disabled = false, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -421,9 +449,11 @@ exports[`Body component tests base = false, color = primary, disabled = false, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -449,9 +479,11 @@ exports[`Body component tests base = false, color = primary, disabled = false, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -462,7 +494,7 @@ exports[`Body component tests base = false, color = primary, disabled = false, p }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -479,9 +511,11 @@ exports[`Body component tests base = false, color = primary, disabled = false, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -492,7 +526,7 @@ exports[`Body component tests base = false, color = primary, disabled = false, p }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -509,9 +543,11 @@ exports[`Body component tests base = false, color = primary, disabled = false, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -522,7 +558,7 @@ exports[`Body component tests base = false, color = primary, disabled = false, p }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -539,9 +575,11 @@ exports[`Body component tests base = false, color = primary, disabled = true, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -569,9 +607,11 @@ exports[`Body component tests base = false, color = primary, disabled = true, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -599,9 +639,11 @@ exports[`Body component tests base = false, color = primary, disabled = true, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -629,9 +671,11 @@ exports[`Body component tests base = false, color = primary, disabled = true, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -642,7 +686,7 @@ exports[`Body component tests base = false, color = primary, disabled = true, pa }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -661,9 +705,11 @@ exports[`Body component tests base = false, color = primary, disabled = true, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -674,7 +720,7 @@ exports[`Body component tests base = false, color = primary, disabled = true, pa }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -693,9 +739,11 @@ exports[`Body component tests base = false, color = primary, disabled = true, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -706,7 +754,7 @@ exports[`Body component tests base = false, color = primary, disabled = true, pa }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -725,9 +773,11 @@ exports[`Body component tests base = false, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -753,9 +803,11 @@ exports[`Body component tests base = false, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -781,9 +833,11 @@ exports[`Body component tests base = false, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -809,9 +863,11 @@ exports[`Body component tests base = false, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -822,7 +878,7 @@ exports[`Body component tests base = false, color = secondary, disabled = false, }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -839,9 +895,11 @@ exports[`Body component tests base = false, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -852,7 +910,7 @@ exports[`Body component tests base = false, color = secondary, disabled = false, }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -869,9 +927,11 @@ exports[`Body component tests base = false, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -882,7 +942,7 @@ exports[`Body component tests base = false, color = secondary, disabled = false, }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -899,9 +959,11 @@ exports[`Body component tests base = false, color = secondary, disabled = true, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -929,9 +991,11 @@ exports[`Body component tests base = false, color = secondary, disabled = true, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -959,9 +1023,11 @@ exports[`Body component tests base = false, color = secondary, disabled = true, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -989,9 +1055,11 @@ exports[`Body component tests base = false, color = secondary, disabled = true, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1002,7 +1070,7 @@ exports[`Body component tests base = false, color = secondary, disabled = true, }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -1021,9 +1089,11 @@ exports[`Body component tests base = false, color = secondary, disabled = true, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1034,7 +1104,7 @@ exports[`Body component tests base = false, color = secondary, disabled = true, }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -1053,9 +1123,11 @@ exports[`Body component tests base = false, color = secondary, disabled = true, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1066,7 +1138,7 @@ exports[`Body component tests base = false, color = secondary, disabled = true, }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -1085,9 +1157,11 @@ exports[`Body component tests base = true, color = default, disabled = false, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1097,7 +1171,8 @@ exports[`Body component tests base = true, color = default, disabled = false, pa "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, false, @@ -1115,9 +1190,11 @@ exports[`Body component tests base = true, color = default, disabled = false, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1127,7 +1204,8 @@ exports[`Body component tests base = true, color = default, disabled = false, pa "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, false, @@ -1145,9 +1223,11 @@ exports[`Body component tests base = true, color = default, disabled = false, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1157,7 +1237,8 @@ exports[`Body component tests base = true, color = default, disabled = false, pa "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, false, @@ -1175,9 +1256,11 @@ exports[`Body component tests base = true, color = default, disabled = false, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1187,10 +1270,11 @@ exports[`Body component tests base = true, color = default, disabled = false, pa "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -1207,9 +1291,11 @@ exports[`Body component tests base = true, color = default, disabled = false, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1219,10 +1305,11 @@ exports[`Body component tests base = true, color = default, disabled = false, pa "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -1239,9 +1326,11 @@ exports[`Body component tests base = true, color = default, disabled = false, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1251,10 +1340,11 @@ exports[`Body component tests base = true, color = default, disabled = false, pa "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -1271,9 +1361,11 @@ exports[`Body component tests base = true, color = default, disabled = true, par style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1283,7 +1375,8 @@ exports[`Body component tests base = true, color = default, disabled = true, par "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, { @@ -1303,9 +1396,11 @@ exports[`Body component tests base = true, color = default, disabled = true, par style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1315,7 +1410,8 @@ exports[`Body component tests base = true, color = default, disabled = true, par "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, { @@ -1335,9 +1431,11 @@ exports[`Body component tests base = true, color = default, disabled = true, par style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1347,7 +1445,8 @@ exports[`Body component tests base = true, color = default, disabled = true, par "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, { @@ -1367,9 +1466,11 @@ exports[`Body component tests base = true, color = default, disabled = true, par style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1379,10 +1480,11 @@ exports[`Body component tests base = true, color = default, disabled = true, par "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -1401,9 +1503,11 @@ exports[`Body component tests base = true, color = default, disabled = true, par style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1413,10 +1517,11 @@ exports[`Body component tests base = true, color = default, disabled = true, par "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -1435,9 +1540,11 @@ exports[`Body component tests base = true, color = default, disabled = true, par style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1447,10 +1554,11 @@ exports[`Body component tests base = true, color = default, disabled = true, par "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -1469,9 +1577,11 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1481,7 +1591,8 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, false, @@ -1499,9 +1610,11 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1511,7 +1624,8 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, false, @@ -1529,9 +1643,11 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1541,7 +1657,8 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, false, @@ -1559,9 +1676,11 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1571,10 +1690,11 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -1591,9 +1711,11 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1603,10 +1725,11 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -1623,9 +1746,11 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1635,10 +1760,11 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -1655,9 +1781,11 @@ exports[`Body component tests base = true, color = primary, disabled = true, par style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1667,7 +1795,8 @@ exports[`Body component tests base = true, color = primary, disabled = true, par "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, { @@ -1687,9 +1816,11 @@ exports[`Body component tests base = true, color = primary, disabled = true, par style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1699,7 +1830,8 @@ exports[`Body component tests base = true, color = primary, disabled = true, par "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, { @@ -1719,9 +1851,11 @@ exports[`Body component tests base = true, color = primary, disabled = true, par style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1731,7 +1865,8 @@ exports[`Body component tests base = true, color = primary, disabled = true, par "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, { @@ -1751,9 +1886,11 @@ exports[`Body component tests base = true, color = primary, disabled = true, par style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1763,10 +1900,11 @@ exports[`Body component tests base = true, color = primary, disabled = true, par "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -1785,9 +1923,11 @@ exports[`Body component tests base = true, color = primary, disabled = true, par style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1797,10 +1937,11 @@ exports[`Body component tests base = true, color = primary, disabled = true, par "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -1819,9 +1960,11 @@ exports[`Body component tests base = true, color = primary, disabled = true, par style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1831,10 +1974,11 @@ exports[`Body component tests base = true, color = primary, disabled = true, par "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -1853,9 +1997,11 @@ exports[`Body component tests base = true, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1865,7 +2011,8 @@ exports[`Body component tests base = true, color = secondary, disabled = false, "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, false, @@ -1883,9 +2030,11 @@ exports[`Body component tests base = true, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1895,7 +2044,8 @@ exports[`Body component tests base = true, color = secondary, disabled = false, "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, false, @@ -1913,9 +2063,11 @@ exports[`Body component tests base = true, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1925,7 +2077,8 @@ exports[`Body component tests base = true, color = secondary, disabled = false, "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, false, @@ -1943,9 +2096,11 @@ exports[`Body component tests base = true, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1955,10 +2110,11 @@ exports[`Body component tests base = true, color = secondary, disabled = false, "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -1975,9 +2131,11 @@ exports[`Body component tests base = true, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -1987,10 +2145,11 @@ exports[`Body component tests base = true, color = secondary, disabled = false, "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -2007,9 +2166,11 @@ exports[`Body component tests base = true, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -2019,10 +2180,11 @@ exports[`Body component tests base = true, color = secondary, disabled = false, "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -2039,9 +2201,11 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -2051,7 +2215,8 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, { @@ -2071,9 +2236,11 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -2083,7 +2250,8 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, { @@ -2103,9 +2271,11 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -2115,7 +2285,8 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, false, { @@ -2135,9 +2306,11 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -2147,10 +2320,11 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -2169,9 +2343,11 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -2181,10 +2357,11 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -2203,9 +2380,11 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { @@ -2215,10 +2394,11 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -2237,9 +2417,11 @@ exports[`Body component tests default props 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, + "letterSpacing": -0.5, + "lineHeight": 20, "verticalAlign": "middle", }, { diff --git a/src/components/Typography/__tests__/__snapshots__/Caption.test.tsx.snap b/src/components/Typography/__tests__/__snapshots__/Caption.test.tsx.snap index 8aee1bc0..629f90f1 100644 --- a/src/components/Typography/__tests__/__snapshots__/Caption.test.tsx.snap +++ b/src/components/Typography/__tests__/__snapshots__/Caption.test.tsx.snap @@ -5,9 +5,11 @@ exports[`Caption component tests color = default, disabled = false 1`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -162,9 +164,11 @@ exports[`Caption component tests color = default, disabled = false 2`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -189,9 +193,11 @@ exports[`Caption component tests color = default, disabled = true 1`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -348,9 +354,11 @@ exports[`Caption component tests color = default, disabled = true 2`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -377,9 +385,11 @@ exports[`Caption component tests color = primary, disabled = false 1`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -534,9 +544,11 @@ exports[`Caption component tests color = primary, disabled = false 2`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -561,9 +573,11 @@ exports[`Caption component tests color = primary, disabled = true 1`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -720,9 +734,11 @@ exports[`Caption component tests color = primary, disabled = true 2`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -749,9 +765,11 @@ exports[`Caption component tests color = secondary, disabled = false 1`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -906,9 +924,11 @@ exports[`Caption component tests color = secondary, disabled = false 2`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -933,9 +953,11 @@ exports[`Caption component tests color = secondary, disabled = true 1`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -1092,9 +1114,11 @@ exports[`Caption component tests color = secondary, disabled = true 2`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { @@ -1121,9 +1145,11 @@ exports[`Caption component tests default props 1`] = ` style={ [ { - "fontFamily": "TT Fellows", + "fontFamily": "Noto Sans", "fontSize": 12.25, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { diff --git a/src/components/Typography/__tests__/__snapshots__/Service.test.tsx.snap b/src/components/Typography/__tests__/__snapshots__/Service.test.tsx.snap index 07505e24..d8fac995 100644 --- a/src/components/Typography/__tests__/__snapshots__/Service.test.tsx.snap +++ b/src/components/Typography/__tests__/__snapshots__/Service.test.tsx.snap @@ -14,14 +14,15 @@ exports[`Service component tests base = false, showIcon = false, variant = dange [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#db3424", }, @@ -47,14 +48,15 @@ exports[`Service component tests base = false, showIcon = false, variant = dange [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#db3424", }, @@ -80,14 +82,15 @@ exports[`Service component tests base = false, showIcon = false, variant = help [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#9457ea", }, @@ -113,14 +116,15 @@ exports[`Service component tests base = false, showIcon = false, variant = help [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#9457ea", }, @@ -146,14 +150,15 @@ exports[`Service component tests base = false, showIcon = false, variant = info [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#1e76cd", }, @@ -179,14 +184,15 @@ exports[`Service component tests base = false, showIcon = false, variant = info [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#1e76cd", }, @@ -212,14 +218,15 @@ exports[`Service component tests base = false, showIcon = false, variant = succe [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#168322", }, @@ -245,14 +252,15 @@ exports[`Service component tests base = false, showIcon = false, variant = succe [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#168322", }, @@ -278,14 +286,15 @@ exports[`Service component tests base = false, showIcon = false, variant = warni [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#dc9710", }, @@ -311,14 +320,15 @@ exports[`Service component tests base = false, showIcon = false, variant = warni [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#dc9710", }, @@ -446,14 +456,15 @@ exports[`Service component tests base = false, showIcon = true, variant = danger [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#db3424", }, @@ -696,14 +707,15 @@ exports[`Service component tests base = false, showIcon = true, variant = danger [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#db3424", }, @@ -854,14 +866,15 @@ exports[`Service component tests base = false, showIcon = true, variant = help 1 [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#9457ea", }, @@ -1104,14 +1117,15 @@ exports[`Service component tests base = false, showIcon = true, variant = help 2 [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#9457ea", }, @@ -1262,14 +1276,15 @@ exports[`Service component tests base = false, showIcon = true, variant = info 1 [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#1e76cd", }, @@ -1512,14 +1527,15 @@ exports[`Service component tests base = false, showIcon = true, variant = info 2 [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#1e76cd", }, @@ -1647,14 +1663,15 @@ exports[`Service component tests base = false, showIcon = true, variant = succes [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#168322", }, @@ -1897,14 +1914,15 @@ exports[`Service component tests base = false, showIcon = true, variant = succes [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#168322", }, @@ -2055,14 +2073,15 @@ exports[`Service component tests base = false, showIcon = true, variant = warnin [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#dc9710", }, @@ -2305,14 +2324,15 @@ exports[`Service component tests base = false, showIcon = true, variant = warnin [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, - { - "fontFamily": "TT Fellows", - "fontSize": 12.25, - }, + false, { "color": "#dc9710", }, @@ -2338,13 +2358,16 @@ exports[`Service component tests base = true, showIcon = false, variant = danger [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#db3424", @@ -2371,13 +2394,16 @@ exports[`Service component tests base = true, showIcon = false, variant = danger [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#db3424", @@ -2404,13 +2430,16 @@ exports[`Service component tests base = true, showIcon = false, variant = help 1 [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#9457ea", @@ -2437,13 +2466,16 @@ exports[`Service component tests base = true, showIcon = false, variant = help 2 [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#9457ea", @@ -2470,13 +2502,16 @@ exports[`Service component tests base = true, showIcon = false, variant = info 1 [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#1e76cd", @@ -2503,13 +2538,16 @@ exports[`Service component tests base = true, showIcon = false, variant = info 2 [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#1e76cd", @@ -2536,13 +2574,16 @@ exports[`Service component tests base = true, showIcon = false, variant = succes [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#168322", @@ -2569,13 +2610,16 @@ exports[`Service component tests base = true, showIcon = false, variant = succes [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#168322", @@ -2602,13 +2646,16 @@ exports[`Service component tests base = true, showIcon = false, variant = warnin [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#dc9710", @@ -2635,13 +2682,16 @@ exports[`Service component tests base = true, showIcon = false, variant = warnin [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#dc9710", @@ -2770,13 +2820,16 @@ exports[`Service component tests base = true, showIcon = true, variant = danger [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#db3424", @@ -3020,13 +3073,16 @@ exports[`Service component tests base = true, showIcon = true, variant = danger [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#db3424", @@ -3178,13 +3234,16 @@ exports[`Service component tests base = true, showIcon = true, variant = help 1` [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#9457ea", @@ -3428,13 +3487,16 @@ exports[`Service component tests base = true, showIcon = true, variant = help 2` [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#9457ea", @@ -3586,13 +3648,16 @@ exports[`Service component tests base = true, showIcon = true, variant = info 1` [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#1e76cd", @@ -3836,13 +3901,16 @@ exports[`Service component tests base = true, showIcon = true, variant = info 2` [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#1e76cd", @@ -3971,13 +4039,16 @@ exports[`Service component tests base = true, showIcon = true, variant = success [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#168322", @@ -4221,13 +4292,16 @@ exports[`Service component tests base = true, showIcon = true, variant = success [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#168322", @@ -4379,13 +4453,16 @@ exports[`Service component tests base = true, showIcon = true, variant = warning [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#dc9710", @@ -4629,13 +4706,16 @@ exports[`Service component tests base = true, showIcon = true, variant = warning [ { "flexShrink": 1, + "fontFamily": "Noto Sans", + "fontSize": 12.25, "fontWeight": 400, "includeFontPadding": false, + "letterSpacing": -0.25, + "lineHeight": 15, "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "lineHeight": 18, }, { "color": "#dc9710", diff --git a/src/components/Typography/__tests__/__snapshots__/Subtitle.test.tsx.snap b/src/components/Typography/__tests__/__snapshots__/Subtitle.test.tsx.snap index a4c294e5..e5e16227 100644 --- a/src/components/Typography/__tests__/__snapshots__/Subtitle.test.tsx.snap +++ b/src/components/Typography/__tests__/__snapshots__/Subtitle.test.tsx.snap @@ -5,9 +5,10 @@ exports[`Subtitle component tests base = false, color = default 1`] = ` style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { @@ -30,9 +31,10 @@ exports[`Subtitle component tests base = false, color = primary 1`] = ` style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { @@ -55,9 +57,10 @@ exports[`Subtitle component tests base = false, color = secondary 1`] = ` style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { @@ -80,9 +83,10 @@ exports[`Subtitle component tests base = false, color = undefined 1`] = ` style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { @@ -105,17 +109,18 @@ exports[`Subtitle component tests base = true, color = default 1`] = ` style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { "color": "#181a1f", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { "margin": 10, @@ -133,17 +138,18 @@ exports[`Subtitle component tests base = true, color = primary 1`] = ` style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { "color": "#44e858", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { "margin": 10, @@ -161,17 +167,18 @@ exports[`Subtitle component tests base = true, color = secondary 1`] = ` style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { "color": "#85888e", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { "margin": 10, @@ -189,17 +196,18 @@ exports[`Subtitle component tests base = true, color = undefined 1`] = ` style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { "color": "#181a1f", }, { - "fontFamily": "PT Sans", - "fontSize": 14, + "fontSize": 12.25, + "lineHeight": 18, }, { "margin": 10, @@ -217,9 +225,10 @@ exports[`Subtitle component tests base = undefined, color = default 1`] = ` style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { @@ -242,9 +251,10 @@ exports[`Subtitle component tests base = undefined, color = primary 1`] = ` style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { @@ -267,9 +277,10 @@ exports[`Subtitle component tests base = undefined, color = secondary 1`] = ` style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { @@ -292,9 +303,10 @@ exports[`Subtitle component tests base = undefined, color = undefined 1`] = ` style={ [ { - "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontFamily": "Noto Sans", + "fontSize": 10.5, "fontWeight": 700, + "lineHeight": 15, "textTransform": "uppercase", }, { diff --git a/src/components/Typography/__tests__/__snapshots__/Title.test.tsx.snap b/src/components/Typography/__tests__/__snapshots__/Title.test.tsx.snap index b73d8f22..f0a009ac 100644 --- a/src/components/Typography/__tests__/__snapshots__/Title.test.tsx.snap +++ b/src/components/Typography/__tests__/__snapshots__/Title.test.tsx.snap @@ -12,7 +12,7 @@ exports[`Title component tests level = h1 1`] = ` "verticalAlign": "middle", }, { - "fontSize": 26.25, + "fontSize": 21, }, undefined, ] @@ -35,7 +35,7 @@ exports[`Title component tests level = h2 1`] = ` "verticalAlign": "middle", }, { - "fontSize": 21, + "fontSize": 17.5, }, undefined, ] @@ -58,7 +58,7 @@ exports[`Title component tests level = h3 1`] = ` "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, undefined, ] @@ -81,7 +81,7 @@ exports[`Title component tests level = h4 1`] = ` "verticalAlign": "middle", }, { - "fontSize": 15.75, + "fontSize": 14, }, undefined, ] @@ -104,7 +104,7 @@ exports[`Title component tests level = h5 1`] = ` "verticalAlign": "middle", }, { - "fontSize": 14, + "fontSize": 12.25, }, undefined, ] @@ -127,7 +127,7 @@ exports[`Title component tests level = h6 1`] = ` "verticalAlign": "middle", }, { - "fontSize": 12.25, + "fontSize": 10.5, }, undefined, ] diff --git a/src/theme/assets/themeDark.json b/src/theme/assets/themeDark.json index d100255b..c99838f3 100644 --- a/src/theme/assets/themeDark.json +++ b/src/theme/assets/themeDark.json @@ -170,7 +170,7 @@ "actionIconHoverColor": "#ffffff", "actionIconHoverBorderColor": "rgba(0, 0, 0, 0.0001)", "fontFamily": "TT Fellows, Roboto, Inter, Helvetica, Arial, sans-serif", - "fontFamilySecondary": "PT Sans, Roboto, Inter, Helvetica, Arial, sans-serif", + "fontFamilySecondary": "Noto Sans, Roboto, Inter, Helvetica, Arial, sans-serif", "fontWeight": "normal", "disabledOpacity": "0.6", "divider": "1px solid $dividerColor", diff --git a/src/theme/assets/themeLight.json b/src/theme/assets/themeLight.json index 97852c3f..d04b5790 100644 --- a/src/theme/assets/themeLight.json +++ b/src/theme/assets/themeLight.json @@ -170,7 +170,7 @@ "actionIconHoverColor": "rgba(0, 0, 0, 0.8000)", "actionIconHoverBorderColor": "rgba(255, 255, 255, 0.0001)", "fontFamily": "TT Fellows, Roboto, Inter, Helvetica, Arial, sans-serif", - "fontFamilySecondary": "PT Sans, Roboto, Inter, Helvetica, Arial, sans-serif", + "fontFamilySecondary": "Noto Sans, Roboto, Inter, Helvetica, Arial, sans-serif", "fontWeight": "normal", "disabledOpacity": "0.6", "divider": "1px solid $dividerColor", diff --git a/src/theme/darkTheme.ts b/src/theme/darkTheme.ts index 46a628d9..1f52f8ed 100644 --- a/src/theme/darkTheme.ts +++ b/src/theme/darkTheme.ts @@ -8,5 +8,5 @@ import type { ThemeType } from './types' export const darkTheme: ThemeType = { theme: { ...darkThemeAssets, InputSize, ModalSize, custom: customDark }, ...commonTheme, - fonts: { primary: 'TT Fellows', secondary: 'PT Sans' }, + fonts: { primary: 'TT Fellows', secondary: 'Noto Sans' }, } diff --git a/src/theme/lightTheme.ts b/src/theme/lightTheme.ts index eecf593d..cc47c3be 100644 --- a/src/theme/lightTheme.ts +++ b/src/theme/lightTheme.ts @@ -8,5 +8,5 @@ import type { ThemeType } from './types' export const lightTheme: ThemeType = { theme: { ...lightThemeAssets, InputSize, ModalSize, custom: customLight }, ...commonTheme, - fonts: { primary: 'TT Fellows', secondary: 'PT Sans' }, + fonts: { primary: 'TT Fellows', secondary: 'Noto Sans' }, }