diff --git a/packages/circuit-ui/components/Body/Body.module.css b/packages/circuit-ui/components/Body/Body.module.css index d826635519..0149952929 100644 --- a/packages/circuit-ui/components/Body/Body.module.css +++ b/packages/circuit-ui/components/Body/Body.module.css @@ -21,15 +21,15 @@ /* Weights */ -.regular { +.base.regular { font-weight: var(--cui-font-weight-regular); } -.semibold { +.base.semibold { font-weight: var(--cui-font-weight-semibold); } -.bold { +.base.bold { font-weight: var(--cui-font-weight-bold); } @@ -90,7 +90,7 @@ .highlight, strong.base, .base strong { - font-weight: var(--cui-font-weight-bold); + font-weight: var(--cui-font-weight-semibold); } .quote, diff --git a/packages/eslint-plugin-circuit-ui/no-renamed-props/index.spec.ts b/packages/eslint-plugin-circuit-ui/no-renamed-props/index.spec.ts index f65a6f30ea..21c29f3887 100644 --- a/packages/eslint-plugin-circuit-ui/no-renamed-props/index.spec.ts +++ b/packages/eslint-plugin-circuit-ui/no-renamed-props/index.spec.ts @@ -354,13 +354,13 @@ ruleTester.run('no-renamed-props', noRenamedProps, { output: ` function ComponentA() { return ( - Lorem ipsum + Lorem ipsum ) } function ComponentB() { return ( - Lorem ipsum + Lorem ipsum ) } diff --git a/packages/eslint-plugin-circuit-ui/no-renamed-props/index.ts b/packages/eslint-plugin-circuit-ui/no-renamed-props/index.ts index c7f8580322..a4a89baf6c 100644 --- a/packages/eslint-plugin-circuit-ui/no-renamed-props/index.ts +++ b/packages/eslint-plugin-circuit-ui/no-renamed-props/index.ts @@ -301,22 +301,16 @@ const configs: (Config & { components: string[] })[] = [ const current = getAttributeValue(attribute); if (current === 'highlight') { - const replacement = `as="strong" weight="bold"`; - const weightAttribute = findAttribute(node, 'weight'); const asAttribute = findAttribute(node, 'as'); + const weightAttribute = findAttribute(node, 'weight'); + const replacement = asAttribute ? 'weight="semibold"' : `as="strong"`; context.report({ node: attribute, messageId: 'bodyVariant', data: { component, current, replacement }, fix: weightAttribute ? undefined - : (fixer) => { - // Don't override an existing `as` attribute - if (asAttribute) { - return fixer.replaceText(attribute, 'weight="bold"'); - } - return fixer.replaceText(attribute, replacement); - }, + : (fixer) => fixer.replaceText(attribute, replacement), }); return; }