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

Move body font size and line height to normalize and also fix the values #1867

Merged
merged 4 commits into from
Jun 29, 2023
Merged

Move body font size and line height to normalize and also fix the values #1867

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e82085
move body font sieze and line height to normalize and also fix the va…
kof Jun 27, 2023
ebf0738
Merge branch 'main' into body-font-size
kof Jun 29, 2023
d9321f6
normalize the font to Arial, sans-serif
kof Jun 29, 2023
ec21a35
fix tests
kof Jun 29, 2023
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
10 changes: 9 additions & 1 deletion packages/react-sdk/src/css/normalize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,17 @@ export const body = [
property: "fontFamily",
value: {
type: "keyword",
value: `system-ui, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji'`,
value: "Arial, sans-serif",
kof marked this conversation as resolved.
Show resolved Hide resolved
},
},
{
property: "fontSize",
kof marked this conversation as resolved.
Show resolved Hide resolved
value: { type: "unit", unit: "px", value: 16 },
},
{
property: "lineHeight",
value: { type: "unit", unit: "number", value: 1.2 },
},
boxSizing,
...borders,
] satisfies Styles;
Expand Down
16 changes: 1 addition & 15 deletions packages/sdk-components-react/src/body.ws.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,7 @@ import { props } from "./__generated__/body.props";
import type { defaultTag } from "./body";

const presetStyle = {
body: [
...body,
{
property: "fontFamily",
value: { type: "keyword", value: "Arial" },
},
{
property: "fontSize",
value: { type: "unit", unit: "px", value: 14 },
},
{
property: "lineHeight",
value: { type: "unit", unit: "number", value: 1.5 },
},
],
body,
} satisfies PresetStyle<typeof defaultTag>;

export const meta: WsComponentMeta = {
Expand Down