fix: Use eds styling to prevent style being overridden in fusion

equinor · Nov 12, 2024 · 12673f2 · 12673f2
1 parent bf4aca9
commit 12673f2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/packages/garden/package.json b/packages/garden/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/workspace-garden",
-  "version": "8.0.2",
+  "version": "8.0.3",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",

diff --git a/packages/garden/src/lib/components/defaultComponents/header/DefaultHeaderView.tsx b/packages/garden/src/lib/components/defaultComponents/header/DefaultHeaderView.tsx
@@ -2,35 +2,37 @@ import { CustomHeaderView } from '../../../types';
 import { memo } from 'react';
 import styled from 'styled-components';
 import { tokens } from '@equinor/eds-tokens';
+import { Typography } from '@equinor/eds-core-react';
 
 const StyledHeaderContent = styled.div`
   display: flex;
   flex-direction: row;
   justify-content: center;
   align-items: center;
-  font-weight: 600;
 `;
 
-const StyledCount = styled.h2`
+const StyledCount = styled(Typography).withConfig({ displayName: 'cc-apps-' })`
   color: ${tokens.colors.text.static_icons__default.hex};
-  font-weight: 300;
-  font-size: 0.8rem;
   margin-left: 0.8em;
+  font-weight: 300;
+  color: inherit;
 `;
 
-const StyledHeaderText = styled.h2`
+const StyledHeaderText = styled(Typography).withConfig({ displayName: 'cc-apps-' })`
   white-space: pre-line;
-  font-size: 16px;
-  text-align: center;
+  font-weight: 500;
+  color: inherit;
 `;
 
 const HeaderView = (props: CustomHeaderView) => {
   const { header } = props;
 
   return (
     <StyledHeaderContent>
-      <StyledHeaderText>{header.name}</StyledHeaderText>
-      <StyledCount>({header.count})</StyledCount>
+      <StyledHeaderText variant="h6">{header.name}</StyledHeaderText>
+      <StyledCount group="navigation" variant="label">
+        ({header.count})
+      </StyledCount>
     </StyledHeaderContent>
   );
 };

diff --git a/packages/workspace-fusion/package.json b/packages/workspace-fusion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/workspace-fusion",
-  "version": "9.0.17",
+  "version": "9.0.18",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",