Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion apps/website/global-styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
body {
margin: 0;
font-family:
Open Sans,
Inter,
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
Expand Down
Binary file not shown.
Binary file not shown.
18 changes: 18 additions & 0 deletions packages/lib/src/styles/injectFonts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import openSansLatinExt from "./fonts/Open-sans-latin-ext.woff2";
import openSansSymbols from "./fonts/Open-sans-symbols.woff2";
import openSansLatinItalic from "./fonts/Open-sans-latin-italic.woff2";
import openSansLatinExtItalic from "./fonts/Open-sans-latin-ext-italic.woff2";
import interVariable from "./fonts/Inter-VariableFont_opsz,wght.woff2";
import interItalicVariable from "./fonts/Inter-Italic-VariableFont_opsz,wght.woff2";

const FONT_FACE_ID = "halstack-material-symbols";

Expand Down Expand Up @@ -36,6 +38,22 @@ if (typeof document !== "undefined" && !document.getElementById(FONT_FACE_ID)) {
-webkit-font-smoothing: antialiased;
}

@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 100 900;
font-display: swap;
src: url("${interVariable}") format('woff2');
}

@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 100 900;
font-display: swap;
src: url("${interItalicVariable}") format('woff2');
}

/* math */
@font-face {
font-family: 'Open Sans';
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/styles/tokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export const coreTokens = {
"--font-weight-semibold": "600",
"--font-weight-bold": "700",
"--font-family-mono": "Source Code Pro, mono",
"--font-family-sans": "Open Sans, sans-serif",
"--font-family-sans": "Inter, sans-serif",
"--font-style-lightitalic": "light italic",
"--font-style-normal": "normal",
"--line-style-dashed": "dashed",
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/styles/variables.css
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
--font-weight-semibold: 600;
--font-weight-bold: 700;
--font-family-mono: Source Code Pro, mono;
--font-family-sans: Open Sans, sans-serif;
--font-family-sans: Inter, sans-serif;
--font-style-lightitalic: light italic;
--font-style-normal: normal;
--line-style-dashed: dashed;
Expand Down
3 changes: 3 additions & 0 deletions packages/lib/src/typography/Typography.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ const Typography = () => (
<DxcTypography display="block" fontWeight="400">
400.
</DxcTypography>
<DxcTypography display="block" fontWeight="500">
500.
</DxcTypography>
<DxcTypography display="block" fontWeight="600">
600.
</DxcTypography>
Expand Down
Loading