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

cloud-font-weight: change weight from 700 to 400 #119

Merged
merged 1 commit into from
May 5, 2022
Merged

cloud-font-weight: change weight from 700 to 400 #119

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
24 changes: 12 additions & 12 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 @@ -21695,7 +21695,7 @@ Object {
},
"fontWeight": Object {
"name": "--vkui--font_caption2--font_weight--regular",
"value": "var(--vkui--font_caption2--font_weight--regular, 700)",
"value": "var(--vkui--font_caption2--font_weight--regular, 400)",
},
"lineHeight": Object {
"name": "--vkui--font_caption2--line_height--regular",
Expand Down Expand Up @@ -21887,7 +21887,7 @@ Object {
},
"fontWeight": Object {
"name": "--vkui--font_footnote--font_weight--regular",
"value": "var(--vkui--font_footnote--font_weight--regular, 700)",
"value": "var(--vkui--font_footnote--font_weight--regular, 400)",
},
"lineHeight": Object {
"name": "--vkui--font_footnote--line_height--regular",
Expand Down Expand Up @@ -22385,7 +22385,7 @@ Object {
},
"fontWeight": Object {
"name": "--vkui--font_text--font_weight--regular",
"value": "var(--vkui--font_text--font_weight--regular, 700)",
"value": "var(--vkui--font_text--font_weight--regular, 400)",
},
"lineHeight": Object {
"name": "--vkui--font_text--line_height--regular",
Expand Down Expand Up @@ -24204,7 +24204,7 @@ Object {
"regular": Object {
"fontFamily": "Inter, Helvetica, Arial, sans-serif",
"fontSize": "11px",
"fontWeight": 700,
"fontWeight": 400,
"lineHeight": "14px",
},
},
Expand Down Expand Up @@ -24242,7 +24242,7 @@ Object {
"regular": Object {
"fontFamily": "Inter, Helvetica, Arial, sans-serif",
"fontSize": "13px",
"fontWeight": 700,
"fontWeight": 400,
"lineHeight": "18px",
},
},
Expand Down Expand Up @@ -24360,7 +24360,7 @@ Object {
"regular": Object {
"fontFamily": "Inter, Helvetica, Arial, sans-serif",
"fontSize": "15px",
"fontWeight": 700,
"fontWeight": 400,
"lineHeight": "20px",
},
},
Expand Down Expand Up @@ -25212,7 +25212,7 @@ Object {
"regular": Object {
"fontFamily": "var(--vkui--font_caption2--font_family--regular, Inter, Helvetica, Arial, sans-serif)",
"fontSize": "var(--vkui--font_caption2--font_size--regular, 11px)",
"fontWeight": "var(--vkui--font_caption2--font_weight--regular, 700)",
"fontWeight": "var(--vkui--font_caption2--font_weight--regular, 400)",
"lineHeight": "var(--vkui--font_caption2--line_height--regular, 14px)",
},
},
Expand Down Expand Up @@ -25250,7 +25250,7 @@ Object {
"regular": Object {
"fontFamily": "var(--vkui--font_footnote--font_family--regular, Inter, Helvetica, Arial, sans-serif)",
"fontSize": "var(--vkui--font_footnote--font_size--regular, 13px)",
"fontWeight": "var(--vkui--font_footnote--font_weight--regular, 700)",
"fontWeight": "var(--vkui--font_footnote--font_weight--regular, 400)",
"lineHeight": "var(--vkui--font_footnote--line_height--regular, 18px)",
},
},
Expand Down Expand Up @@ -25368,7 +25368,7 @@ Object {
"regular": Object {
"fontFamily": "var(--vkui--font_text--font_family--regular, Inter, Helvetica, Arial, sans-serif)",
"fontSize": "var(--vkui--font_text--font_size--regular, 15px)",
"fontWeight": "var(--vkui--font_text--font_weight--regular, 700)",
"fontWeight": "var(--vkui--font_text--font_weight--regular, 400)",
"lineHeight": "var(--vkui--font_text--line_height--regular, 20px)",
},
},
Expand Down Expand Up @@ -26220,7 +26220,7 @@ Object {
"regular": Object {
"fontFamily": "Inter, Helvetica, Arial, sans-serif",
"fontSize": 11,
"fontWeight": 700,
"fontWeight": 400,
"lineHeight": "14px",
},
},
Expand Down Expand Up @@ -26258,7 +26258,7 @@ Object {
"regular": Object {
"fontFamily": "Inter, Helvetica, Arial, sans-serif",
"fontSize": 13,
"fontWeight": 700,
"fontWeight": 400,
"lineHeight": "18px",
},
},
Expand Down Expand Up @@ -26376,7 +26376,7 @@ Object {
"regular": Object {
"fontFamily": "Inter, Helvetica, Arial, sans-serif",
"fontSize": 15,
"fontWeight": 700,
"fontWeight": 400,
"lineHeight": "20px",
},
},
Expand Down
20 changes: 10 additions & 10 deletions src/themeDescriptions/themes/cloud/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const fontFamilyBase: Property.FontFamily =
'Inter, Helvetica, Arial, sans-serif';
const {
fontFamilyAccent,
fontWeightBase1,
fontWeightBase3,
fontWeightAccent1,
fontWeightAccent2,
} = lightTheme;
Expand All @@ -31,63 +31,63 @@ const fontAccentBoldAtributes: FontAccentAtributes = {
const fontSize1: Font = {
fontSize: 11,
lineHeight: '14px',
fontWeight: staticRef(fontWeightBase1),
fontWeight: staticRef(fontWeightBase3),
fontFamily: fontFamilyBase,
};

const fontSize2: Font = {
fontSize: 13,
lineHeight: '18px',
fontWeight: staticRef(fontWeightBase1),
fontWeight: staticRef(fontWeightBase3),
fontFamily: fontFamilyBase,
};

const fontSize3: Font = {
fontSize: 15,
lineHeight: '20px',
fontWeight: staticRef(fontWeightBase1),
fontWeight: staticRef(fontWeightBase3),
fontFamily: fontFamilyBase,
};

const fontSize4: Font = {
fontSize: 17,
lineHeight: '24px',
fontWeight: staticRef(fontWeightBase1),
fontWeight: staticRef(fontWeightBase3),
fontFamily: fontFamilyBase,
};

const fontSize5: Font = {
fontSize: 20,
lineHeight: '26px',
fontWeight: staticRef(fontWeightBase1),
fontWeight: staticRef(fontWeightBase3),
fontFamily: fontFamilyBase,
};

const fontSize6: Font = {
fontSize: 24,
lineHeight: '28px',
fontWeight: staticRef(fontWeightBase1),
fontWeight: staticRef(fontWeightBase3),
fontFamily: fontFamilyBase,
};

const fontSize7: Font = {
fontSize: 28,
lineHeight: '32px',
fontWeight: staticRef(fontWeightBase1),
fontWeight: staticRef(fontWeightBase3),
fontFamily: fontFamilyBase,
};

const fontSize8: Font = {
fontSize: 32,
lineHeight: '36px',
fontWeight: staticRef(fontWeightBase1),
fontWeight: staticRef(fontWeightBase3),
fontFamily: fontFamilyBase,
};

const fontSize9: Font = {
fontSize: 40,
lineHeight: '48px',
fontWeight: staticRef(fontWeightBase1),
fontWeight: staticRef(fontWeightBase3),
fontFamily: fontFamilyBase,
};

Expand Down