Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(vkontakteAndroid): fontFamilyAccent rewrite #773

Merged
merged 1 commit into from
Jan 30, 2024
Merged

fix(vkontakteAndroid): fontFamilyAccent rewrite #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/build/__snapshots__/snapthots.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329470,7 +329470,7 @@ exports[`shapshots vkontakteAndroid theme should match cssVars snapshot 1`] = `
},
"fontFamilyAccent": {
"name": "--vkui--font_family_accent",
"value": "var(--vkui--font_family_accent, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"value": "var(--vkui--font_family_accent, "VK Sans Display", -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
},
"fontFamilyBase": {
"name": "--vkui--font_family_base",
Expand Down Expand Up @@ -332602,7 +332602,7 @@ exports[`shapshots vkontakteAndroid theme should match pixelify theme snapshot 1
"lineHeight": "24px",
},
},
"fontFamilyAccent": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontFamilyAccent": ""VK Sans Display", -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontFamilyBase": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontFamilyFallbacks": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontFootnote": {
Expand Down Expand Up @@ -333978,7 +333978,7 @@ exports[`shapshots vkontakteAndroid theme should match pseudo theme from CssVars
"lineHeight": "var(--vkui--font_display_title4--line_height--regular, 24px)",
},
},
"fontFamilyAccent": "var(--vkui--font_family_accent, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontFamilyAccent": "var(--vkui--font_family_accent, "VK Sans Display", -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontFamilyBase": "var(--vkui--font_family_base, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontFamilyFallbacks": "var(--vkui--font_family_fallbacks, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontFootnote": {
Expand Down Expand Up @@ -335354,7 +335354,7 @@ exports[`shapshots vkontakteAndroid theme should match root theme snapshot 1`] =
"lineHeight": 24,
},
},
"fontFamilyAccent": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontFamilyAccent": ""VK Sans Display", -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontFamilyBase": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontFamilyFallbacks": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontFootnote": {
Expand Down Expand Up @@ -338058,7 +338058,7 @@ exports[`shapshots vkontakteAndroidDark theme should match cssVars snapshot 1`]
},
"fontFamilyAccent": {
"name": "--vkui--font_family_accent",
"value": "var(--vkui--font_family_accent, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"value": "var(--vkui--font_family_accent, "VK Sans Display", -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
},
"fontFamilyBase": {
"name": "--vkui--font_family_base",
Expand Down Expand Up @@ -341190,7 +341190,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pixelify theme snapsh
"lineHeight": "24px",
},
},
"fontFamilyAccent": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontFamilyAccent": ""VK Sans Display", -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontFamilyBase": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontFamilyFallbacks": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontFootnote": {
Expand Down Expand Up @@ -342566,7 +342566,7 @@ exports[`shapshots vkontakteAndroidDark theme should match pseudo theme from Css
"lineHeight": "var(--vkui--font_display_title4--line_height--regular, 24px)",
},
},
"fontFamilyAccent": "var(--vkui--font_family_accent, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontFamilyAccent": "var(--vkui--font_family_accent, "VK Sans Display", -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontFamilyBase": "var(--vkui--font_family_base, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontFamilyFallbacks": "var(--vkui--font_family_fallbacks, -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif)",
"fontFootnote": {
Expand Down Expand Up @@ -343942,7 +343942,7 @@ exports[`shapshots vkontakteAndroidDark theme should match root theme snapshot 1
"lineHeight": 24,
},
},
"fontFamilyAccent": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontFamilyAccent": ""VK Sans Display", -apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontFamilyBase": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontFamilyFallbacks": "-apple-system, system-ui, "Helvetica Neue", Roboto, sans-serif",
"fontFootnote": {
Expand Down
4 changes: 2 additions & 2 deletions src/themeDescriptions/themes/vkontakteAndroid/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,8 @@ export const vkontakteAndroidTheme: ThemeVkontakteAndroidDescription = {
...vkLightTheme.colors,
...vkontakteLocalColorLight,
},
...vkontakteTokens,
...androidFonts,
...vkontakteTokens,
};

export const vkontakteAndroidThemeDark: ThemeVkontakteAndroidDarkDescription = {
Expand All @@ -414,6 +414,6 @@ export const vkontakteAndroidThemeDark: ThemeVkontakteAndroidDarkDescription = {
...vkDarkTheme.colors,
...vkontakteLocalColorDark,
},
...vkontakteTokens,
...androidFonts,
...vkontakteTokens,
};