= #{tokens.$breakpoints-sm}) {
:root {
- --ids-toaster-font-size: #{tokens.$font-size-4};
- --ids-toaster-font-weight: #{tokens.$font-weight-bold};
- --ids-toaster-inset: #{tokens.$space-3} 0 auto 0;
- --ids-toaster-border-radius: #{tokens.$border-radius-sm};
- --ids-toaster-padding: #{tokens.$space-3} #{tokens.$space-3} calc(#{tokens.$space-3} + #{tokens.$space-1}) #{tokens.$space-3};
- }
-
- [data-brand="workleap"] {
--ids-toaster-font-size: var(--hop-body-md-medium-font-size);
--ids-toaster-font-weight: var(--hop-body-md-medium-font-weight);
--ids-toaster-inset: var(--hop-space-stack-md) 0 auto 0;
diff --git a/packages/Toggle/src/Toggle.stories.tsx b/packages/Toggle/src/Toggle.stories.tsx
index 25cc19407..5e8f685fe 100644
--- a/packages/Toggle/src/Toggle.stories.tsx
+++ b/packages/Toggle/src/Toggle.stories.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { Meta, StoryFn } from '@storybook/react';
+import { Meta } from '@storybook/react';
import Section from '@components/section';
import readme from '../README.md';
@@ -15,8 +15,9 @@ export default {
description: {
component: readme.replace(/
/g, '').replace(/
/g, ''),
}
- }
- },
+ },
+ brand: "workleap",
+ }
} as Meta
;
export const Overview = {
diff --git a/packages/Toggle/src/toggle.scss b/packages/Toggle/src/toggle.scss
index 8d044affe..a0521efb6 100644
--- a/packages/Toggle/src/toggle.scss
+++ b/packages/Toggle/src/toggle.scss
@@ -6,59 +6,6 @@
@layer igloo {
:root {
- /* Default */
- --ids-toggle-font-family: #{tokens.$primary-font-family};
- --ids-toggle-font-size: #{tokens.$font-size-4};
- --ids-toggle-line-height: normal;
- --ids-toggle-text-padding: #{tokens.$space-2};
- --ids-toggle-font-weight: #{tokens.$font-weight-regular};
- --ids-toggle-width: #{tokens.$space-6};
- --ids-toggle-height: 2rem;
- --ids-toggle-background: #{tokens.$grey-300};
- --ids-toggle-border: transparent;
- --ids-toggle-transition: background-color 0.3s ease-in-out;
- --ids-toggle-focus: #{tokens.$focus};
- --ids-toggle-padding: #{tokens.$space-1};
- --ids-toggle-font-size-description: #{tokens.$font-size-3};
- --ids-toggle-line-height-description: normal;
- --ids-toggle-text-description: #{tokens.$grey-600};
-
- /* switch */
- --ids-toggle-width-switch: #{tokens.$space-3};
- --ids-toggle-height-switch: #{tokens.$space-3};
- --ids-toggle-margin: 0.2rem;
- --ids-toggle-background-switch: #{tokens.$samoyed};
- --ids-toggle-background-switch-disabled: #{tokens.$samoyed};
- --ids-toggle-shadow-switch: 0 .1rem .3rem 0 rgb(0 0 0 / 25%);
-
- /* checked */
- --ids-toggle-background-checked: #{tokens.$electric-blue-500};
- --ids-toggle-background-switch-checked: #{tokens.$samoyed};
- --ids-toggle-border-checked: transparent;
- --ids-toggle-position-checked:
- calc(
- var(--ids-toggle-width) - var(--ids-toggle-width-switch) - 0.4rem
- );
-
- /* hover */
- --ids-toggle-background-hover: #{tokens.$grey-300};
- --ids-toggle-border-hover: transparent;
- --ids-toggle-text-label-hover: inherit;
- --ids-toggle-background-switch-hover: var(--ids-toggle-background);
-
- /* pressed */
- --ids-toggle-background-pressed: #{tokens.$grey-300};
- --ids-toggle-border-pressed: transparent;
- --ids-toggle-text-label-pressed: inherit;
-
- /* disabled */
- --ids-toggle-background-disabled: #{tokens.$grey-200};
- --ids-toggle-background-checked-disabled: #{tokens.$electric-blue-300};
- --ids-toggle-border-disabled: transparent;
- --ids-toggle-border-checked-disabled: transparent;
- }
-
- [data-brand="workleap"] {
/* Default */
--ids-toggle-font-family: var(--hop-body-md-font-family);
--ids-toggle-font-size: var(--hop-body-md-font-size);
diff --git a/packages/Tooltip/src/Tooltip.stories.tsx b/packages/Tooltip/src/Tooltip.stories.tsx
index a67ddd3bc..47db598a3 100644
--- a/packages/Tooltip/src/Tooltip.stories.tsx
+++ b/packages/Tooltip/src/Tooltip.stories.tsx
@@ -1,14 +1,14 @@
-import React from 'react';
import isChromatic from 'chromatic/isChromatic';
+import React from 'react';
import { Meta } from '@storybook/react';
-import Tooltip, { TooltipProps } from './Tooltip';
import Button from '@igloo-ui/button';
import IconButton from '@igloo-ui/icon-button';
-import Modal from '@igloo-ui/modal';
import Delete from '@igloo-ui/icons/dist/Delete';
import HelpSolid from '@igloo-ui/icons/dist/HelpSolid';
+import Modal from '@igloo-ui/modal';
+import Tooltip, { TooltipProps } from './Tooltip';
import ChromaticWrapper from '@components/chromaticWrapper';
@@ -27,6 +27,7 @@ export default {
}
},
chromatic: { disableSnapshot: true },
+ brand: "workleap"
},
args: {
children: 'Playground tooltip',
@@ -46,13 +47,11 @@ export default {
},
},
decorators: [
- (Story, context) => {
- const isWorleap = context.globals.brand === 'workleap';
-
+ (Story) => {
return (
)},
- ],
+ ]
} as Meta;
export const Overview = {
diff --git a/packages/Tooltip/src/Tooltip.tsx b/packages/Tooltip/src/Tooltip.tsx
index 25862fc72..8be60f596 100644
--- a/packages/Tooltip/src/Tooltip.tsx
+++ b/packages/Tooltip/src/Tooltip.tsx
@@ -48,10 +48,6 @@ export interface TooltipProps
showOnMobile?: boolean;
}
-const getBrand = (): string => {
- return document.documentElement.getAttribute("data-brand") ?? "igloo";
-};
-
const Tooltip: React.FunctionComponent = ({
children,
content,
@@ -66,9 +62,7 @@ const Tooltip: React.FunctionComponent = ({
showOnMobile = false,
...rest
}: TooltipProps) => {
- const isWorkleap = getBrand() === "workleap";
const classes = cx("ids-tooltip__container", className);
- const fontBase = isWorkleap ? 16 : 10;
const arrowRef = React.useRef(null);
@@ -142,7 +136,7 @@ const Tooltip: React.FunctionComponent = ({
"ids-tooltip--light": appearance === "light"
});
- const fromPxToRem = (value: number, base = fontBase): string =>
+ const fromPxToRem = (value: number, base = 16): string =>
`${value / base}rem`;
const center = position === "top" || position === "bottom";
diff --git a/packages/Tooltip/src/tooltip.scss b/packages/Tooltip/src/tooltip.scss
index 0457e91e5..4cd3902a6 100644
--- a/packages/Tooltip/src/tooltip.scss
+++ b/packages/Tooltip/src/tooltip.scss
@@ -6,27 +6,6 @@
@layer igloo {
:root {
- /* Default */
- --ids-tooltip-font-family: #{tokens.$primary-font-family};
- --ids-tooltip-font-size: #{tokens.$font-size-2};
- --ids-tooltip-padding: #{tokens.$space-2} #{tokens.$space-3};
- --ids-tooltip-border-radius: #{tokens.$border-radius-sm};
- --ids-tooltip-z-index: #{tokens.$z-index-max};
- --ids-tooltip-arrow-size: .5rem;
- --ids-tooltip-arrow-display: block;
-
- /* Theme */
- --ids-tooltip-text: #{tokens.$samoyed};
- --ids-tooltip-background: #{tokens.$electric-blue-900};
- --ids-tooltip-shadow: none;
-
- /* Light */
- --ids-tooltip-light-text: #{tokens.$grey-800};
- --ids-tooltip-light-background: #{tokens.$samoyed};
- --ids-tooltip-light-shadow: #{tokens.$shadow-12};
- }
-
- [data-brand="workleap"] {
/* Default */
--ids-tooltip-font-family: var(--hop-body-xs-font-family);
--ids-tooltip-font-size: var(--hop-body-xs-font-size);
diff --git a/packages/VerticalBarChart/src/VerticalBarChart.stories.tsx b/packages/VerticalBarChart/src/VerticalBarChart.stories.tsx
index 46276c7be..f9eb16942 100644
--- a/packages/VerticalBarChart/src/VerticalBarChart.stories.tsx
+++ b/packages/VerticalBarChart/src/VerticalBarChart.stories.tsx
@@ -2,7 +2,6 @@ import React from 'react';
import { Meta, StoryObj } from '@storybook/react';
-import tokens from '@igloo-ui/tokens/dist/base10/tokens.json';
import readme from '../README.md';
import VerticalBarChart from './VerticalBarChart';
@@ -16,6 +15,7 @@ export default {
component: readme.replace(//g, '').replace(//g, ''),
},
},
+ brand: "workleap"
},
decorators: [
(Story) => (
@@ -23,14 +23,6 @@ export default {