Skip to content

Commit

Permalink
Merge pull request #1040 from VKCOM/fix-octavius-font
Browse files Browse the repository at this point in the history 
NOTASK: fix
  • Loading branch information
@Sarafa2n
Sarafa2n authored Aug 23, 2024
2 parents 2605a6b + 089efc3 commit a940ad6
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 17 deletions.
32 changes: 16 additions & 16 deletions src/build/__snapshots__/snapthots.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128569,7 +128569,7 @@ exports[`shapshots octavius theme should match cssVars snapshot 1`] = `
},
"octaviusFontFamilyMailSans": {
"name": "--vkui--octavius_font_family_mail_sans",
"value": "var(--vkui--octavius_font_family_mail_sans, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif)",
"value": "var(--vkui--octavius_font_family_mail_sans, VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif)",
},
"octaviusImageBackground": {
"name": "--vkui--octavius_image_background",
Expand Down Expand Up @@ -131884,7 +131884,7 @@ exports[`shapshots octavius theme should match pixelify theme snapshot 1`] = `
"octaviusFontFamilyDisplay": "inherit",
"octaviusFontFamilyGlobal": "Arial, Tahoma, Verdana, sans-serif",
"octaviusFontFamilyMac": "Helvetica, Arial, Tahoma, Verdana, sans-serif",
"octaviusFontFamilyMailSans": "MailSans, HelveticaNeue, Helvetica, Arial, sans-serif",
"octaviusFontFamilyMailSans": "VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif",
"octaviusImageBackground": "none",
"octaviusImageOverlayBackground": "none",
"octaviusPositionBackground": "50% 0",
Expand Down Expand Up @@ -134091,7 +134091,7 @@ exports[`shapshots octavius theme should match pseudo theme from CssVars 1`] = `
"octaviusFontFamilyDisplay": "var(--vkui--octavius_font_family_display, inherit)",
"octaviusFontFamilyGlobal": "var(--vkui--octavius_font_family_global, Arial, Tahoma, Verdana, sans-serif)",
"octaviusFontFamilyMac": "var(--vkui--octavius_font_family_mac, Helvetica, Arial, Tahoma, Verdana, sans-serif)",
"octaviusFontFamilyMailSans": "var(--vkui--octavius_font_family_mail_sans, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif)",
"octaviusFontFamilyMailSans": "var(--vkui--octavius_font_family_mail_sans, VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif)",
"octaviusImageBackground": "var(--vkui--octavius_image_background, none)",
"octaviusImageOverlayBackground": "var(--vkui--octavius_image_overlay_background, none)",
"octaviusPositionBackground": "var(--vkui--octavius_position_background, 50% 0)",
Expand Down Expand Up @@ -136298,7 +136298,7 @@ exports[`shapshots octavius theme should match root theme snapshot 1`] = `
"octaviusFontFamilyDisplay": "inherit",
"octaviusFontFamilyGlobal": "Arial, Tahoma, Verdana, sans-serif",
"octaviusFontFamilyMac": "Helvetica, Arial, Tahoma, Verdana, sans-serif",
"octaviusFontFamilyMailSans": "MailSans, HelveticaNeue, Helvetica, Arial, sans-serif",
"octaviusFontFamilyMailSans": "VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif",
"octaviusImageBackground": "none",
"octaviusImageOverlayBackground": "none",
"octaviusPositionBackground": "50% 0",
Expand Down Expand Up @@ -142076,7 +142076,7 @@ exports[`shapshots octaviusCompact theme should match cssVars snapshot 1`] = `
},
"octaviusFontFamilyMailSans": {
"name": "--vkui--octavius_font_family_mail_sans",
"value": "var(--vkui--octavius_font_family_mail_sans, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif)",
"value": "var(--vkui--octavius_font_family_mail_sans, VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif)",
},
"octaviusImageBackground": {
"name": "--vkui--octavius_image_background",
Expand Down Expand Up @@ -145395,7 +145395,7 @@ exports[`shapshots octaviusCompact theme should match pixelify theme snapshot 1`
"octaviusFontFamilyDisplay": "inherit",
"octaviusFontFamilyGlobal": "Arial, Tahoma, Verdana, sans-serif",
"octaviusFontFamilyMac": "Helvetica, Arial, Tahoma, Verdana, sans-serif",
"octaviusFontFamilyMailSans": "MailSans, HelveticaNeue, Helvetica, Arial, sans-serif",
"octaviusFontFamilyMailSans": "VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif",
"octaviusImageBackground": "none",
"octaviusImageOverlayBackground": "none",
"octaviusPositionBackground": "50% 0",
Expand Down Expand Up @@ -147603,7 +147603,7 @@ exports[`shapshots octaviusCompact theme should match pseudo theme from CssVars
"octaviusFontFamilyDisplay": "var(--vkui--octavius_font_family_display, inherit)",
"octaviusFontFamilyGlobal": "var(--vkui--octavius_font_family_global, Arial, Tahoma, Verdana, sans-serif)",
"octaviusFontFamilyMac": "var(--vkui--octavius_font_family_mac, Helvetica, Arial, Tahoma, Verdana, sans-serif)",
"octaviusFontFamilyMailSans": "var(--vkui--octavius_font_family_mail_sans, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif)",
"octaviusFontFamilyMailSans": "var(--vkui--octavius_font_family_mail_sans, VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif)",
"octaviusImageBackground": "var(--vkui--octavius_image_background, none)",
"octaviusImageOverlayBackground": "var(--vkui--octavius_image_overlay_background, none)",
"octaviusPositionBackground": "var(--vkui--octavius_position_background, 50% 0)",
Expand Down Expand Up @@ -149811,7 +149811,7 @@ exports[`shapshots octaviusCompact theme should match root theme snapshot 1`] =
"octaviusFontFamilyDisplay": "inherit",
"octaviusFontFamilyGlobal": "Arial, Tahoma, Verdana, sans-serif",
"octaviusFontFamilyMac": "Helvetica, Arial, Tahoma, Verdana, sans-serif",
"octaviusFontFamilyMailSans": "MailSans, HelveticaNeue, Helvetica, Arial, sans-serif",
"octaviusFontFamilyMailSans": "VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif",
"octaviusImageBackground": "none",
"octaviusImageOverlayBackground": "none",
"octaviusPositionBackground": "50% 0",
Expand Down Expand Up @@ -155590,7 +155590,7 @@ exports[`shapshots octaviusCompactDark theme should match cssVars snapshot 1`] =
},
"octaviusFontFamilyMailSans": {
"name": "--vkui--octavius_font_family_mail_sans",
"value": "var(--vkui--octavius_font_family_mail_sans, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif)",
"value": "var(--vkui--octavius_font_family_mail_sans, VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif)",
},
"octaviusImageBackground": {
"name": "--vkui--octavius_image_background",
Expand Down Expand Up @@ -158909,7 +158909,7 @@ exports[`shapshots octaviusCompactDark theme should match pixelify theme snapsho
"octaviusFontFamilyDisplay": "inherit",
"octaviusFontFamilyGlobal": "Arial, Tahoma, Verdana, sans-serif",
"octaviusFontFamilyMac": "Helvetica, Arial, Tahoma, Verdana, sans-serif",
"octaviusFontFamilyMailSans": "MailSans, HelveticaNeue, Helvetica, Arial, sans-serif",
"octaviusFontFamilyMailSans": "VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif",
"octaviusImageBackground": "none",
"octaviusImageOverlayBackground": "none",
"octaviusPositionBackground": "50% 0",
Expand Down Expand Up @@ -161117,7 +161117,7 @@ exports[`shapshots octaviusCompactDark theme should match pseudo theme from CssV
"octaviusFontFamilyDisplay": "var(--vkui--octavius_font_family_display, inherit)",
"octaviusFontFamilyGlobal": "var(--vkui--octavius_font_family_global, Arial, Tahoma, Verdana, sans-serif)",
"octaviusFontFamilyMac": "var(--vkui--octavius_font_family_mac, Helvetica, Arial, Tahoma, Verdana, sans-serif)",
"octaviusFontFamilyMailSans": "var(--vkui--octavius_font_family_mail_sans, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif)",
"octaviusFontFamilyMailSans": "var(--vkui--octavius_font_family_mail_sans, VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif)",
"octaviusImageBackground": "var(--vkui--octavius_image_background, none)",
"octaviusImageOverlayBackground": "var(--vkui--octavius_image_overlay_background, none)",
"octaviusPositionBackground": "var(--vkui--octavius_position_background, 50% 0)",
Expand Down Expand Up @@ -163325,7 +163325,7 @@ exports[`shapshots octaviusCompactDark theme should match root theme snapshot 1`
"octaviusFontFamilyDisplay": "inherit",
"octaviusFontFamilyGlobal": "Arial, Tahoma, Verdana, sans-serif",
"octaviusFontFamilyMac": "Helvetica, Arial, Tahoma, Verdana, sans-serif",
"octaviusFontFamilyMailSans": "MailSans, HelveticaNeue, Helvetica, Arial, sans-serif",
"octaviusFontFamilyMailSans": "VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif",
"octaviusImageBackground": "none",
"octaviusImageOverlayBackground": "none",
"octaviusPositionBackground": "50% 0",
Expand Down Expand Up @@ -169104,7 +169104,7 @@ exports[`shapshots octaviusDark theme should match cssVars snapshot 1`] = `
},
"octaviusFontFamilyMailSans": {
"name": "--vkui--octavius_font_family_mail_sans",
"value": "var(--vkui--octavius_font_family_mail_sans, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif)",
"value": "var(--vkui--octavius_font_family_mail_sans, VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif)",
},
"octaviusImageBackground": {
"name": "--vkui--octavius_image_background",
Expand Down Expand Up @@ -172419,7 +172419,7 @@ exports[`shapshots octaviusDark theme should match pixelify theme snapshot 1`] =
"octaviusFontFamilyDisplay": "inherit",
"octaviusFontFamilyGlobal": "Arial, Tahoma, Verdana, sans-serif",
"octaviusFontFamilyMac": "Helvetica, Arial, Tahoma, Verdana, sans-serif",
"octaviusFontFamilyMailSans": "MailSans, HelveticaNeue, Helvetica, Arial, sans-serif",
"octaviusFontFamilyMailSans": "VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif",
"octaviusImageBackground": "none",
"octaviusImageOverlayBackground": "none",
"octaviusPositionBackground": "50% 0",
Expand Down Expand Up @@ -174626,7 +174626,7 @@ exports[`shapshots octaviusDark theme should match pseudo theme from CssVars 1`]
"octaviusFontFamilyDisplay": "var(--vkui--octavius_font_family_display, inherit)",
"octaviusFontFamilyGlobal": "var(--vkui--octavius_font_family_global, Arial, Tahoma, Verdana, sans-serif)",
"octaviusFontFamilyMac": "var(--vkui--octavius_font_family_mac, Helvetica, Arial, Tahoma, Verdana, sans-serif)",
"octaviusFontFamilyMailSans": "var(--vkui--octavius_font_family_mail_sans, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif)",
"octaviusFontFamilyMailSans": "var(--vkui--octavius_font_family_mail_sans, VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif)",
"octaviusImageBackground": "var(--vkui--octavius_image_background, none)",
"octaviusImageOverlayBackground": "var(--vkui--octavius_image_overlay_background, none)",
"octaviusPositionBackground": "var(--vkui--octavius_position_background, 50% 0)",
Expand Down Expand Up @@ -176833,7 +176833,7 @@ exports[`shapshots octaviusDark theme should match root theme snapshot 1`] = `
"octaviusFontFamilyDisplay": "inherit",
"octaviusFontFamilyGlobal": "Arial, Tahoma, Verdana, sans-serif",
"octaviusFontFamilyMac": "Helvetica, Arial, Tahoma, Verdana, sans-serif",
"octaviusFontFamilyMailSans": "MailSans, HelveticaNeue, Helvetica, Arial, sans-serif",
"octaviusFontFamilyMailSans": "VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif",
"octaviusImageBackground": "none",
"octaviusImageOverlayBackground": "none",
"octaviusPositionBackground": "50% 0",
Expand Down
3 changes: 2 additions & 1 deletion src/themeDescriptions/themes/octavius/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,8 @@ export const octaviusTheme: ThemeOctaviusDescription = {

octaviusFontFamilyDefault: 'HelveticaNeue, Helvetica, Arial, sans-serif',

octaviusFontFamilyMailSans: 'MailSans, HelveticaNeue, Helvetica, Arial, sans-serif',
octaviusFontFamilyMailSans:
'VKSansDisplay, MailSans, HelveticaNeue, Helvetica, Arial, sans-serif',

octaviusFontFamilyGlobal: 'Arial, Tahoma, Verdana, sans-serif',
octaviusFontFamilyMac: 'Helvetica, Arial, Tahoma, Verdana, sans-serif',
Expand Down

0 comments on commit a940ad6

Please sign in to comment.