diff --git a/README.md b/README.md index 3480315c..8f0c82cc 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 }, ], }, ], @@ -130,7 +131,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) // остальной код... } 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..cf02186d 100644 --- a/src/components/Dialog/__tests__/__snapshots__/DialogHeader.test.tsx.snap +++ b/src/components/Dialog/__tests__/__snapshots__/DialogHeader.test.tsx.snap @@ -119,14 +119,14 @@ exports[`DialogHeader {"onClose": [Function mockConstructor], "severity": "dange style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -430,14 +430,14 @@ exports[`DialogHeader {"onClose": [Function mockConstructor], "severity": "help" style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -741,14 +741,14 @@ exports[`DialogHeader {"onClose": [Function mockConstructor], "severity": "info" style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -1029,14 +1029,14 @@ exports[`DialogHeader {"onClose": [Function mockConstructor], "severity": "succe style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -1340,14 +1340,14 @@ exports[`DialogHeader {"onClose": [Function mockConstructor], "severity": "warni style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -1526,14 +1526,14 @@ exports[`DialogHeader {"onClose": [Function mockConstructor], "severity": undefi style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -1814,14 +1814,14 @@ exports[`DialogHeader {"onClose": undefined, "severity": "danger", "title": "Dia style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -1986,14 +1986,14 @@ exports[`DialogHeader {"onClose": undefined, "severity": "help", "title": "Dialo style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -2158,14 +2158,14 @@ exports[`DialogHeader {"onClose": undefined, "severity": "info", "title": "Dialo style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -2307,14 +2307,14 @@ exports[`DialogHeader {"onClose": undefined, "severity": "success", "title": "Di style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -2479,14 +2479,14 @@ exports[`DialogHeader {"onClose": undefined, "severity": "warning", "title": "Di style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, { "flex": 1, @@ -2526,14 +2526,14 @@ exports[`DialogHeader {"onClose": undefined, "severity": undefined, "title": "Di style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "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..966f8b9d 100644 --- a/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap +++ b/src/components/Divider/__tests__/__snapshots__/Divider.test.tsx.snap @@ -118,7 +118,7 @@ exports[`Divider {"Icon": [Object], "align": "end", "layout": "horizontal", "sho { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "textTransform": "uppercase", }, { @@ -370,7 +370,7 @@ exports[`Divider {"Icon": [Object], "align": "end", "layout": "vertical", "text" { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "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..6d27cbd0 100644 --- a/src/components/List/Base/__tests__/__snapshots__/ListBase.test.tsx.snap +++ b/src/components/List/Base/__tests__/__snapshots__/ListBase.test.tsx.snap @@ -282,7 +282,7 @@ exports[`ListBase tests ListBase centered and full divider 1`] = ` { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "textTransform": "uppercase", }, { @@ -307,8 +307,8 @@ exports[`ListBase tests ListBase centered and full divider 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -333,7 +333,7 @@ exports[`ListBase tests ListBase centered and full divider 1`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -833,7 +833,7 @@ exports[`ListBase tests ListBase full disabled 1`] = ` { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "textTransform": "uppercase", }, { @@ -858,8 +858,8 @@ exports[`ListBase tests ListBase full disabled 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -884,7 +884,7 @@ exports[`ListBase tests ListBase full disabled 1`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1391,7 +1391,7 @@ exports[`ListBase tests ListBase maximal config 1`] = ` { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "textTransform": "uppercase", }, { @@ -1416,8 +1416,8 @@ exports[`ListBase tests ListBase maximal config 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1442,7 +1442,7 @@ exports[`ListBase tests ListBase maximal config 1`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1747,8 +1747,8 @@ exports[`ListBase tests ListBase minimal config 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "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..648c57a6 100644 --- a/src/components/MenuItem/Template/__tests__/__snapshots__/MenuItemTemplate.test.tsx.snap +++ b/src/components/MenuItem/Template/__tests__/__snapshots__/MenuItemTemplate.test.tsx.snap @@ -241,8 +241,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate full disabled 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -253,7 +253,7 @@ exports[`MenuItemTemplate tests MenuItemTemplate full disabled 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, undefined, undefined, @@ -269,7 +269,7 @@ exports[`MenuItemTemplate tests MenuItemTemplate full disabled 1`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -604,8 +604,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate minimal config 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -616,7 +616,7 @@ exports[`MenuItemTemplate tests MenuItemTemplate minimal config 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, undefined, undefined, @@ -804,8 +804,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate prefix,suffix = right 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -816,7 +816,7 @@ exports[`MenuItemTemplate tests MenuItemTemplate prefix,suffix = right 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, undefined, undefined, @@ -832,7 +832,7 @@ exports[`MenuItemTemplate tests MenuItemTemplate prefix,suffix = right 1`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1138,8 +1138,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate with colored icon 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1150,7 +1150,7 @@ exports[`MenuItemTemplate tests MenuItemTemplate with colored icon 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, undefined, undefined, @@ -1251,8 +1251,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate with extra 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1263,7 +1263,7 @@ exports[`MenuItemTemplate tests MenuItemTemplate with extra 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, undefined, undefined, @@ -1573,8 +1573,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate with icon 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1585,7 +1585,7 @@ exports[`MenuItemTemplate tests MenuItemTemplate with icon 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, undefined, undefined, @@ -1834,8 +1834,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate with icon and badge 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1846,7 +1846,7 @@ exports[`MenuItemTemplate tests MenuItemTemplate with icon and badge 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, undefined, undefined, @@ -1950,8 +1950,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate with padding 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1962,7 +1962,7 @@ exports[`MenuItemTemplate tests MenuItemTemplate with padding 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, undefined, undefined, @@ -2069,8 +2069,8 @@ exports[`MenuItemTemplate tests MenuItemTemplate with separator 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -2081,7 +2081,7 @@ exports[`MenuItemTemplate tests MenuItemTemplate with separator 1`] = ` "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, 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..826dfd17 100644 --- a/src/components/Typography/Anchor.tsx +++ b/src/components/Typography/Anchor.tsx @@ -137,7 +137,7 @@ const styles = StyleSheet.create(({ spacing, typography, fonts }) => ({ container: { flexDirection: 'row', alignItems: 'center' }, text: { flexShrink: 1, - fontSize: typography.Size['text-sm'], + fontSize: typography.Size['text-xs'], includeFontPadding: false, verticalAlign: 'middle', color: typography.Color.Service['text-info'], diff --git a/src/components/Typography/Body.tsx b/src/components/Typography/Body.tsx index a988db0a..924041a1 100644 --- a/src/components/Typography/Body.tsx +++ b/src/components/Typography/Body.tsx @@ -38,7 +38,7 @@ 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, @@ -49,8 +49,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'] }, + 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..1635298e 100644 --- a/src/components/Typography/Caption.tsx +++ b/src/components/Typography/Caption.tsx @@ -59,7 +59,7 @@ const CaptionTestId = { text: 'CaptionText', icon: 'CaptionIcon' } const styles = StyleSheet.create(({ theme, spacing, typography, fonts }) => ({ text: { - fontSize: typography.Size['text-sm'], + fontSize: typography.Size['text-xs'], includeFontPadding: false, verticalAlign: 'middle', fontFamily: fonts.primary, diff --git a/src/components/Typography/Subtitle.tsx b/src/components/Typography/Subtitle.tsx index 9b9e29bb..9d767a6f 100644 --- a/src/components/Typography/Subtitle.tsx +++ b/src/components/Typography/Subtitle.tsx @@ -33,7 +33,7 @@ export const Subtitle = memo( const styles = StyleSheet.create(({ theme, typography, fonts }) => ({ text: { fontSize: typography.Size['text-sm'], - fontWeight: 700, + fontWeight: 500, textTransform: 'uppercase', fontFamily: fonts.primary, }, diff --git a/src/components/Typography/Title.tsx b/src/components/Typography/Title.tsx index 41b44c8f..27c19933 100644 --- a/src/components/Typography/Title.tsx +++ b/src/components/Typography/Title.tsx @@ -12,19 +12,19 @@ export const Title = ({ level, style, ...other }: TitleProps) => ( const styles = StyleSheet.create(({ theme, typography, fonts }) => ({ text: { - color: theme.General.textColor, + color: theme.General.secondaryColor, fontFamily: fonts.primary, fontWeight: 700, 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'], lineHeight: 12 }, })) diff --git a/src/components/Typography/__tests__/__snapshots__/Anchor.test.tsx.snap b/src/components/Typography/__tests__/__snapshots__/Anchor.test.tsx.snap index 8d73d362..cc224de9 100644 --- a/src/components/Typography/__tests__/__snapshots__/Anchor.test.tsx.snap +++ b/src/components/Typography/__tests__/__snapshots__/Anchor.test.tsx.snap @@ -20,7 +20,7 @@ exports[`Body component tests default props 1`] = ` "color": "#1e76cd", "flexShrink": 1, "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -221,13 +221,13 @@ exports[`Body component tests левая иконка, base, visited, testID = C "color": "#1e76cd", "flexShrink": 1, "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, false, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -428,7 +428,7 @@ exports[`Body component tests левая иконка, правая иконка "color": "#1e76cd", "flexShrink": 1, "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -623,7 +623,7 @@ exports[`Body component tests правая иконка, noWrapper 1`] = ` "color": "#1e76cd", "flexShrink": 1, "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, diff --git a/src/components/Typography/__tests__/__snapshots__/Body.test.tsx.snap b/src/components/Typography/__tests__/__snapshots__/Body.test.tsx.snap index 2b990010..93c880df 100644 --- a/src/components/Typography/__tests__/__snapshots__/Body.test.tsx.snap +++ b/src/components/Typography/__tests__/__snapshots__/Body.test.tsx.snap @@ -5,8 +5,8 @@ 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, "verticalAlign": "middle", }, @@ -33,8 +33,8 @@ 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, "verticalAlign": "middle", }, @@ -61,8 +61,8 @@ 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, "verticalAlign": "middle", }, @@ -89,8 +89,8 @@ 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, "verticalAlign": "middle", }, @@ -102,7 +102,7 @@ exports[`Body component tests base = false, color = default, disabled = false, p }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -119,8 +119,8 @@ 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, "verticalAlign": "middle", }, @@ -132,7 +132,7 @@ exports[`Body component tests base = false, color = default, disabled = false, p }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -149,8 +149,8 @@ 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, "verticalAlign": "middle", }, @@ -162,7 +162,7 @@ exports[`Body component tests base = false, color = default, disabled = false, p }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -179,8 +179,8 @@ 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, "verticalAlign": "middle", }, @@ -209,8 +209,8 @@ 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, "verticalAlign": "middle", }, @@ -239,8 +239,8 @@ 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, "verticalAlign": "middle", }, @@ -269,8 +269,8 @@ 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, "verticalAlign": "middle", }, @@ -282,7 +282,7 @@ exports[`Body component tests base = false, color = default, disabled = true, pa }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -301,8 +301,8 @@ 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, "verticalAlign": "middle", }, @@ -314,7 +314,7 @@ exports[`Body component tests base = false, color = default, disabled = true, pa }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -333,8 +333,8 @@ 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, "verticalAlign": "middle", }, @@ -346,7 +346,7 @@ exports[`Body component tests base = false, color = default, disabled = true, pa }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -365,8 +365,8 @@ 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, "verticalAlign": "middle", }, @@ -393,8 +393,8 @@ 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, "verticalAlign": "middle", }, @@ -421,8 +421,8 @@ 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, "verticalAlign": "middle", }, @@ -449,8 +449,8 @@ 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, "verticalAlign": "middle", }, @@ -462,7 +462,7 @@ exports[`Body component tests base = false, color = primary, disabled = false, p }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -479,8 +479,8 @@ 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, "verticalAlign": "middle", }, @@ -492,7 +492,7 @@ exports[`Body component tests base = false, color = primary, disabled = false, p }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -509,8 +509,8 @@ 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, "verticalAlign": "middle", }, @@ -522,7 +522,7 @@ exports[`Body component tests base = false, color = primary, disabled = false, p }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -539,8 +539,8 @@ 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, "verticalAlign": "middle", }, @@ -569,8 +569,8 @@ 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, "verticalAlign": "middle", }, @@ -599,8 +599,8 @@ 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, "verticalAlign": "middle", }, @@ -629,8 +629,8 @@ 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, "verticalAlign": "middle", }, @@ -642,7 +642,7 @@ exports[`Body component tests base = false, color = primary, disabled = true, pa }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -661,8 +661,8 @@ 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, "verticalAlign": "middle", }, @@ -674,7 +674,7 @@ exports[`Body component tests base = false, color = primary, disabled = true, pa }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -693,8 +693,8 @@ 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, "verticalAlign": "middle", }, @@ -706,7 +706,7 @@ exports[`Body component tests base = false, color = primary, disabled = true, pa }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -725,8 +725,8 @@ exports[`Body component tests base = false, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -753,8 +753,8 @@ exports[`Body component tests base = false, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -781,8 +781,8 @@ exports[`Body component tests base = false, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -809,8 +809,8 @@ exports[`Body component tests base = false, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -822,7 +822,7 @@ exports[`Body component tests base = false, color = secondary, disabled = false, }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -839,8 +839,8 @@ exports[`Body component tests base = false, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -852,7 +852,7 @@ exports[`Body component tests base = false, color = secondary, disabled = false, }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -869,8 +869,8 @@ exports[`Body component tests base = false, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -882,7 +882,7 @@ exports[`Body component tests base = false, color = secondary, disabled = false, }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, false, undefined, @@ -899,8 +899,8 @@ exports[`Body component tests base = false, color = secondary, disabled = true, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -929,8 +929,8 @@ exports[`Body component tests base = false, color = secondary, disabled = true, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -959,8 +959,8 @@ exports[`Body component tests base = false, color = secondary, disabled = true, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -989,8 +989,8 @@ exports[`Body component tests base = false, color = secondary, disabled = true, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1002,7 +1002,7 @@ exports[`Body component tests base = false, color = secondary, disabled = true, }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -1021,8 +1021,8 @@ exports[`Body component tests base = false, color = secondary, disabled = true, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1034,7 +1034,7 @@ exports[`Body component tests base = false, color = secondary, disabled = true, }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -1053,8 +1053,8 @@ exports[`Body component tests base = false, color = secondary, disabled = true, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1066,7 +1066,7 @@ exports[`Body component tests base = false, color = secondary, disabled = true, }, false, { - "fontSize": 15.75, + "lineHeight": 24, }, { "opacity": 0.6, @@ -1085,8 +1085,8 @@ 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, "verticalAlign": "middle", }, @@ -1097,7 +1097,7 @@ exports[`Body component tests base = true, color = default, disabled = false, pa "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, false, @@ -1115,8 +1115,8 @@ 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, "verticalAlign": "middle", }, @@ -1127,7 +1127,7 @@ exports[`Body component tests base = true, color = default, disabled = false, pa "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, false, @@ -1145,8 +1145,8 @@ 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, "verticalAlign": "middle", }, @@ -1157,7 +1157,7 @@ exports[`Body component tests base = true, color = default, disabled = false, pa "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, false, @@ -1175,8 +1175,8 @@ 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, "verticalAlign": "middle", }, @@ -1187,10 +1187,10 @@ exports[`Body component tests base = true, color = default, disabled = false, pa "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -1207,8 +1207,8 @@ 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, "verticalAlign": "middle", }, @@ -1219,10 +1219,10 @@ exports[`Body component tests base = true, color = default, disabled = false, pa "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -1239,8 +1239,8 @@ 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, "verticalAlign": "middle", }, @@ -1251,10 +1251,10 @@ exports[`Body component tests base = true, color = default, disabled = false, pa "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -1271,8 +1271,8 @@ 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, "verticalAlign": "middle", }, @@ -1283,7 +1283,7 @@ exports[`Body component tests base = true, color = default, disabled = true, par "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, { @@ -1303,8 +1303,8 @@ 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, "verticalAlign": "middle", }, @@ -1315,7 +1315,7 @@ exports[`Body component tests base = true, color = default, disabled = true, par "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, { @@ -1335,8 +1335,8 @@ 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, "verticalAlign": "middle", }, @@ -1347,7 +1347,7 @@ exports[`Body component tests base = true, color = default, disabled = true, par "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, { @@ -1367,8 +1367,8 @@ 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, "verticalAlign": "middle", }, @@ -1379,10 +1379,10 @@ exports[`Body component tests base = true, color = default, disabled = true, par "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -1401,8 +1401,8 @@ 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, "verticalAlign": "middle", }, @@ -1413,10 +1413,10 @@ exports[`Body component tests base = true, color = default, disabled = true, par "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -1435,8 +1435,8 @@ 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, "verticalAlign": "middle", }, @@ -1447,10 +1447,10 @@ exports[`Body component tests base = true, color = default, disabled = true, par "color": "#181a1f", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -1469,8 +1469,8 @@ 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, "verticalAlign": "middle", }, @@ -1481,7 +1481,7 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, false, @@ -1499,8 +1499,8 @@ 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, "verticalAlign": "middle", }, @@ -1511,7 +1511,7 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, false, @@ -1529,8 +1529,8 @@ 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, "verticalAlign": "middle", }, @@ -1541,7 +1541,7 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, false, @@ -1559,8 +1559,8 @@ 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, "verticalAlign": "middle", }, @@ -1571,10 +1571,10 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -1591,8 +1591,8 @@ 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, "verticalAlign": "middle", }, @@ -1603,10 +1603,10 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -1623,8 +1623,8 @@ 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, "verticalAlign": "middle", }, @@ -1635,10 +1635,10 @@ exports[`Body component tests base = true, color = primary, disabled = false, pa "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -1655,8 +1655,8 @@ 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, "verticalAlign": "middle", }, @@ -1667,7 +1667,7 @@ exports[`Body component tests base = true, color = primary, disabled = true, par "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, { @@ -1687,8 +1687,8 @@ 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, "verticalAlign": "middle", }, @@ -1699,7 +1699,7 @@ exports[`Body component tests base = true, color = primary, disabled = true, par "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, { @@ -1719,8 +1719,8 @@ 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, "verticalAlign": "middle", }, @@ -1731,7 +1731,7 @@ exports[`Body component tests base = true, color = primary, disabled = true, par "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, { @@ -1751,8 +1751,8 @@ 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, "verticalAlign": "middle", }, @@ -1763,10 +1763,10 @@ exports[`Body component tests base = true, color = primary, disabled = true, par "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -1785,8 +1785,8 @@ 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, "verticalAlign": "middle", }, @@ -1797,10 +1797,10 @@ exports[`Body component tests base = true, color = primary, disabled = true, par "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -1819,8 +1819,8 @@ 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, "verticalAlign": "middle", }, @@ -1831,10 +1831,10 @@ exports[`Body component tests base = true, color = primary, disabled = true, par "color": "#44e858", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -1853,8 +1853,8 @@ exports[`Body component tests base = true, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1865,7 +1865,7 @@ exports[`Body component tests base = true, color = secondary, disabled = false, "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, false, @@ -1883,8 +1883,8 @@ exports[`Body component tests base = true, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1895,7 +1895,7 @@ exports[`Body component tests base = true, color = secondary, disabled = false, "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, false, @@ -1913,8 +1913,8 @@ exports[`Body component tests base = true, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1925,7 +1925,7 @@ exports[`Body component tests base = true, color = secondary, disabled = false, "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, false, @@ -1943,8 +1943,8 @@ exports[`Body component tests base = true, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1955,10 +1955,10 @@ exports[`Body component tests base = true, color = secondary, disabled = false, "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -1975,8 +1975,8 @@ exports[`Body component tests base = true, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1987,10 +1987,10 @@ exports[`Body component tests base = true, color = secondary, disabled = false, "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -2007,8 +2007,8 @@ exports[`Body component tests base = true, color = secondary, disabled = false, style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -2019,10 +2019,10 @@ exports[`Body component tests base = true, color = secondary, disabled = false, "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, false, undefined, @@ -2039,8 +2039,8 @@ 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, "verticalAlign": "middle", }, @@ -2051,7 +2051,7 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, { @@ -2071,8 +2071,8 @@ 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, "verticalAlign": "middle", }, @@ -2083,7 +2083,7 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, { @@ -2103,8 +2103,8 @@ 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, "verticalAlign": "middle", }, @@ -2115,7 +2115,7 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, }, false, { @@ -2135,8 +2135,8 @@ 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, "verticalAlign": "middle", }, @@ -2147,10 +2147,10 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -2169,8 +2169,8 @@ 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, "verticalAlign": "middle", }, @@ -2181,10 +2181,10 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -2203,8 +2203,8 @@ 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, "verticalAlign": "middle", }, @@ -2215,10 +2215,10 @@ exports[`Body component tests base = true, color = secondary, disabled = true, p "color": "#85888e", }, { - "fontSize": 14, + "fontSize": 12.25, }, { - "fontSize": 14, + "lineHeight": 21, }, { "opacity": 0.6, @@ -2237,8 +2237,8 @@ exports[`Body component tests default props 1`] = ` style={ [ { - "fontFamily": "PT Sans", - "fontSize": 15.75, + "fontFamily": "Noto Sans", + "fontSize": 14, "includeFontPadding": false, "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..75ac6e1b 100644 --- a/src/components/Typography/__tests__/__snapshots__/Caption.test.tsx.snap +++ b/src/components/Typography/__tests__/__snapshots__/Caption.test.tsx.snap @@ -6,7 +6,7 @@ exports[`Caption component tests color = default, disabled = false 1`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -163,7 +163,7 @@ exports[`Caption component tests color = default, disabled = false 2`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -190,7 +190,7 @@ exports[`Caption component tests color = default, disabled = true 1`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -349,7 +349,7 @@ exports[`Caption component tests color = default, disabled = true 2`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -378,7 +378,7 @@ exports[`Caption component tests color = primary, disabled = false 1`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -535,7 +535,7 @@ exports[`Caption component tests color = primary, disabled = false 2`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -562,7 +562,7 @@ exports[`Caption component tests color = primary, disabled = true 1`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -721,7 +721,7 @@ exports[`Caption component tests color = primary, disabled = true 2`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -750,7 +750,7 @@ exports[`Caption component tests color = secondary, disabled = false 1`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -907,7 +907,7 @@ exports[`Caption component tests color = secondary, disabled = false 2`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -934,7 +934,7 @@ exports[`Caption component tests color = secondary, disabled = true 1`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1093,7 +1093,7 @@ exports[`Caption component tests color = secondary, disabled = true 2`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "verticalAlign": "middle", }, @@ -1122,7 +1122,7 @@ exports[`Caption component tests default props 1`] = ` [ { "fontFamily": "TT Fellows", - "fontSize": 12.25, + "fontSize": 10.5, "includeFontPadding": false, "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..ab2fe4fa 100644 --- a/src/components/Typography/__tests__/__snapshots__/Service.test.tsx.snap +++ b/src/components/Typography/__tests__/__snapshots__/Service.test.tsx.snap @@ -2343,7 +2343,7 @@ exports[`Service component tests base = true, showIcon = false, variant = danger "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -2376,7 +2376,7 @@ exports[`Service component tests base = true, showIcon = false, variant = danger "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -2409,7 +2409,7 @@ exports[`Service component tests base = true, showIcon = false, variant = help 1 "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -2442,7 +2442,7 @@ exports[`Service component tests base = true, showIcon = false, variant = help 2 "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -2475,7 +2475,7 @@ exports[`Service component tests base = true, showIcon = false, variant = info 1 "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -2508,7 +2508,7 @@ exports[`Service component tests base = true, showIcon = false, variant = info 2 "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -2541,7 +2541,7 @@ exports[`Service component tests base = true, showIcon = false, variant = succes "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -2574,7 +2574,7 @@ exports[`Service component tests base = true, showIcon = false, variant = succes "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -2607,7 +2607,7 @@ exports[`Service component tests base = true, showIcon = false, variant = warnin "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -2640,7 +2640,7 @@ exports[`Service component tests base = true, showIcon = false, variant = warnin "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -2775,7 +2775,7 @@ exports[`Service component tests base = true, showIcon = true, variant = danger "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -3025,7 +3025,7 @@ exports[`Service component tests base = true, showIcon = true, variant = danger "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -3183,7 +3183,7 @@ exports[`Service component tests base = true, showIcon = true, variant = help 1` "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -3433,7 +3433,7 @@ exports[`Service component tests base = true, showIcon = true, variant = help 2` "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -3591,7 +3591,7 @@ exports[`Service component tests base = true, showIcon = true, variant = info 1` "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -3841,7 +3841,7 @@ exports[`Service component tests base = true, showIcon = true, variant = info 2` "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -3976,7 +3976,7 @@ exports[`Service component tests base = true, showIcon = true, variant = success "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -4226,7 +4226,7 @@ exports[`Service component tests base = true, showIcon = true, variant = success "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -4384,7 +4384,7 @@ exports[`Service component tests base = true, showIcon = true, variant = warning "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -4634,7 +4634,7 @@ exports[`Service component tests base = true, showIcon = true, variant = warning "verticalAlign": "middle", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { diff --git a/src/components/Typography/__tests__/__snapshots__/Subtitle.test.tsx.snap b/src/components/Typography/__tests__/__snapshots__/Subtitle.test.tsx.snap index a4c294e5..a118c7d0 100644 --- a/src/components/Typography/__tests__/__snapshots__/Subtitle.test.tsx.snap +++ b/src/components/Typography/__tests__/__snapshots__/Subtitle.test.tsx.snap @@ -7,7 +7,7 @@ exports[`Subtitle component tests base = false, color = default 1`] = ` { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "textTransform": "uppercase", }, { @@ -32,7 +32,7 @@ exports[`Subtitle component tests base = false, color = primary 1`] = ` { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "textTransform": "uppercase", }, { @@ -57,7 +57,7 @@ exports[`Subtitle component tests base = false, color = secondary 1`] = ` { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "textTransform": "uppercase", }, { @@ -82,7 +82,7 @@ exports[`Subtitle component tests base = false, color = undefined 1`] = ` { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "textTransform": "uppercase", }, { @@ -107,14 +107,14 @@ exports[`Subtitle component tests base = true, color = default 1`] = ` { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "textTransform": "uppercase", }, { "color": "#181a1f", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -135,14 +135,14 @@ exports[`Subtitle component tests base = true, color = primary 1`] = ` { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "textTransform": "uppercase", }, { "color": "#44e858", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -163,14 +163,14 @@ exports[`Subtitle component tests base = true, color = secondary 1`] = ` { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "textTransform": "uppercase", }, { "color": "#85888e", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -191,14 +191,14 @@ exports[`Subtitle component tests base = true, color = undefined 1`] = ` { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "textTransform": "uppercase", }, { "color": "#181a1f", }, { - "fontFamily": "PT Sans", + "fontFamily": "Noto Sans", "fontSize": 14, }, { @@ -219,7 +219,7 @@ exports[`Subtitle component tests base = undefined, color = default 1`] = ` { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "textTransform": "uppercase", }, { @@ -244,7 +244,7 @@ exports[`Subtitle component tests base = undefined, color = primary 1`] = ` { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "textTransform": "uppercase", }, { @@ -269,7 +269,7 @@ exports[`Subtitle component tests base = undefined, color = secondary 1`] = ` { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "textTransform": "uppercase", }, { @@ -294,7 +294,7 @@ exports[`Subtitle component tests base = undefined, color = undefined 1`] = ` { "fontFamily": "TT Fellows", "fontSize": 12.25, - "fontWeight": 700, + "fontWeight": 500, "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..19c8d7cf 100644 --- a/src/components/Typography/__tests__/__snapshots__/Title.test.tsx.snap +++ b/src/components/Typography/__tests__/__snapshots__/Title.test.tsx.snap @@ -5,14 +5,14 @@ exports[`Title component tests level = h1 1`] = ` style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 26.25, + "fontSize": 21, }, undefined, ] @@ -28,14 +28,14 @@ exports[`Title component tests level = h2 1`] = ` style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 21, + "fontSize": 17.5, }, undefined, ] @@ -51,14 +51,14 @@ exports[`Title component tests level = h3 1`] = ` style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 17.5, + "fontSize": 15.75, }, undefined, ] @@ -74,14 +74,14 @@ exports[`Title component tests level = h4 1`] = ` style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 15.75, + "fontSize": 14, }, undefined, ] @@ -97,14 +97,14 @@ exports[`Title component tests level = h5 1`] = ` style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 14, + "fontSize": 12.25, }, undefined, ] @@ -120,14 +120,15 @@ exports[`Title component tests level = h6 1`] = ` style={ [ { - "color": "#181a1f", + "color": "#2b2e33", "fontFamily": "TT Fellows", "fontWeight": 700, "includeFontPadding": false, "verticalAlign": "middle", }, { - "fontSize": 12.25, + "fontSize": 10.5, + "lineHeight": 12, }, undefined, ] 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' }, }