diff --git a/.lintstagedrc.json b/.lintstagedrc.json index 5759d8eec3..cd61545659 100644 --- a/.lintstagedrc.json +++ b/.lintstagedrc.json @@ -1,5 +1,5 @@ { "src/**/*.{js,ts,tsx,scss}": [ - "yarn run lint-fix" + "yarn run lint-fix --" ] -} +} \ No newline at end of file diff --git a/packages/fuselage/.loki/reference/chrome_iphone7_Data_Display_Tag_Default.png b/packages/fuselage/.loki/reference/chrome_iphone7_Data_Display_Tag_Default.png index 81669ed1a8..c64ee77244 100644 Binary files a/packages/fuselage/.loki/reference/chrome_iphone7_Data_Display_Tag_Default.png and b/packages/fuselage/.loki/reference/chrome_iphone7_Data_Display_Tag_Default.png differ diff --git a/packages/fuselage/.loki/reference/chrome_iphone7_Data_Display_Tag_Pointer.png b/packages/fuselage/.loki/reference/chrome_iphone7_Data_Display_Tag_Pointer.png index 81669ed1a8..c64ee77244 100644 Binary files a/packages/fuselage/.loki/reference/chrome_iphone7_Data_Display_Tag_Pointer.png and b/packages/fuselage/.loki/reference/chrome_iphone7_Data_Display_Tag_Pointer.png differ diff --git a/packages/fuselage/.loki/reference/chrome_iphone7_Data_Display_Tag_Secondary.png b/packages/fuselage/.loki/reference/chrome_iphone7_Data_Display_Tag_Secondary.png new file mode 100644 index 0000000000..81669ed1a8 Binary files /dev/null and b/packages/fuselage/.loki/reference/chrome_iphone7_Data_Display_Tag_Secondary.png differ diff --git a/packages/fuselage/.loki/reference/chrome_iphone7_Data_Display_Tag_With_Icon.png b/packages/fuselage/.loki/reference/chrome_iphone7_Data_Display_Tag_With_Icon.png new file mode 100644 index 0000000000..f25426a648 Binary files /dev/null and b/packages/fuselage/.loki/reference/chrome_iphone7_Data_Display_Tag_With_Icon.png differ diff --git a/packages/fuselage/.loki/reference/chrome_laptop_Data_Display_Tag_Default.png b/packages/fuselage/.loki/reference/chrome_laptop_Data_Display_Tag_Default.png index ade6cfc65a..bd50be009e 100644 Binary files a/packages/fuselage/.loki/reference/chrome_laptop_Data_Display_Tag_Default.png and b/packages/fuselage/.loki/reference/chrome_laptop_Data_Display_Tag_Default.png differ diff --git a/packages/fuselage/.loki/reference/chrome_laptop_Data_Display_Tag_Pointer.png b/packages/fuselage/.loki/reference/chrome_laptop_Data_Display_Tag_Pointer.png index ade6cfc65a..bd50be009e 100644 Binary files a/packages/fuselage/.loki/reference/chrome_laptop_Data_Display_Tag_Pointer.png and b/packages/fuselage/.loki/reference/chrome_laptop_Data_Display_Tag_Pointer.png differ diff --git a/packages/fuselage/.loki/reference/chrome_laptop_Data_Display_Tag_Secondary.png b/packages/fuselage/.loki/reference/chrome_laptop_Data_Display_Tag_Secondary.png new file mode 100644 index 0000000000..ade6cfc65a Binary files /dev/null and b/packages/fuselage/.loki/reference/chrome_laptop_Data_Display_Tag_Secondary.png differ diff --git a/packages/fuselage/.loki/reference/chrome_laptop_Data_Display_Tag_With_Icon.png b/packages/fuselage/.loki/reference/chrome_laptop_Data_Display_Tag_With_Icon.png new file mode 100644 index 0000000000..61c8ee3029 Binary files /dev/null and b/packages/fuselage/.loki/reference/chrome_laptop_Data_Display_Tag_With_Icon.png differ diff --git a/packages/fuselage/src/components/Tag/Tag.stories.mdx b/packages/fuselage/src/components/Tag/Tag.stories.mdx index d3e60b75fb..32c5144ad3 100644 --- a/packages/fuselage/src/components/Tag/Tag.stories.mdx +++ b/packages/fuselage/src/components/Tag/Tag.stories.mdx @@ -1,6 +1,6 @@ import { Meta, Canvas, ArgsTable, Story } from '@storybook/addon-docs/blocks'; -import { Tag, Box } from '../..'; +import { Tag, Box, Icon } from '../..'; @@ -24,6 +24,22 @@ Used for mentions. +### Secondary + + + + john.doe + + + +### With icon + + + + john.doe + + + ### Primary diff --git a/packages/fuselage/src/components/Tag/index.js b/packages/fuselage/src/components/Tag/index.js index 24e38460b2..e43fe87317 100644 --- a/packages/fuselage/src/components/Tag/index.js +++ b/packages/fuselage/src/components/Tag/index.js @@ -10,7 +10,7 @@ export function Tag({ className, disabled, onClick, - variant = 'secondary', + variant = 'default', ...props }) { const modifiers = [ @@ -43,5 +43,6 @@ Tag.propTypes = { 'danger', 'warning', 'ghost', + 'default', ]), }; diff --git a/packages/fuselage/src/components/Tag/styles.scss b/packages/fuselage/src/components/Tag/styles.scss index 07c0b11e3c..f4cebeccd5 100644 --- a/packages/fuselage/src/components/Tag/styles.scss +++ b/packages/fuselage/src/components/Tag/styles.scss @@ -2,6 +2,15 @@ @use '../../styles/lengths.scss'; @use '../../styles/typography.scss'; +$tag-colors-default-color: theme( + 'tag-colors-default-color', + colors.foreground(default) +); +$tag-colors-default-background-color: theme( + 'tag-colors-default-background-color', + colors.neutral(400) +); + $tag-colors-secondary-color: theme( 'tag-colors-secondary-color', colors.foreground(primary) @@ -76,6 +85,11 @@ $tag-colors-disabled-background-color: theme( @include typography.use-font-scale(micro); + &--default { + color: $tag-colors-default-color; + background-color: $tag-colors-default-background-color; + } + &--secondary { color: $tag-colors-secondary-color; background-color: $tag-colors-secondary-background-color;