Skip to content

Commit 8d625da

Browse files
authored
Merge pull request #1957 from dxc-technology/jialecl-fontsWorkaround
fonts css reverted back and changed the approach to load fonts
2 parents 35a1d38 + 4efe42d commit 8d625da

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

lib/.storybook/preview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import styled from "styled-components";
33
import type { Preview } from "@storybook/react";
44
import React from "react";
55
import { disabledRules } from "../test/accessibility/rules/common/disabledRules";
6-
import "../src/common/fonts.css";
76

87
const preview: Preview = {
98
parameters: {
@@ -33,6 +32,7 @@ const preview: Preview = {
3332
};
3433

3534
const Container = styled.div`
35+
@import url("https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:FILL@0..1");
3636
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans",
3737
"Droid Sans", "Helvetica Neue", sans-serif;
3838
`;

lib/src/HalstackContext.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { useMemo } from "react";
22
import Color from "color";
3+
import { createGlobalStyle } from "styled-components";
34
import {
45
AdvancedTheme,
56
OpinionatedTheme,
@@ -384,10 +385,15 @@ const HalstackProvider = ({ theme, advancedTheme, labels, children }: HalstackPr
384385

385386
return (
386387
<HalstackContext.Provider value={parsedTheme}>
388+
<GlobalStyle />
387389
<HalstackLanguageContext.Provider value={parsedLabels}>{children}</HalstackLanguageContext.Provider>
388390
</HalstackContext.Provider>
389391
);
390392
};
391393

394+
const GlobalStyle = createGlobalStyle`
395+
@import url("https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,600;0,700;0,800;1,300;1,400;1,600;1,700;1,800&display=swap");
396+
`;
397+
392398
export default HalstackContext;
393399
export { HalstackProvider, HalstackLanguageContext };

lib/src/common/fonts.css

Lines changed: 0 additions & 2 deletions
This file was deleted.

lib/src/icon/Icon.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const IconContainer = styled.span<{
1616
icon: string;
1717
filled: boolean;
1818
}>`
19+
@import url("https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:FILL@0..1");
1920
font-family: "Material Symbols Outlined";
2021
font-weight: normal;
2122
font-style: normal;

lib/src/main.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import "./common/fonts.css";
21
import DxcAlert from "./alert/Alert";
32
import DxcAccordion from "./accordion/Accordion";
43
import DxcButton from "./button/Button";

0 commit comments

Comments
 (0)