diff --git a/app/javascript/dashboard/assets/scss/_foundation-custom.scss b/app/javascript/dashboard/assets/scss/_foundation-custom.scss index d93c60aa4..9c398e078 100644 --- a/app/javascript/dashboard/assets/scss/_foundation-custom.scss +++ b/app/javascript/dashboard/assets/scss/_foundation-custom.scss @@ -15,10 +15,6 @@ } } -.label { - font-weight: $font-weight-bold; -} - .tooltip { border-radius: $space-smaller; font-size: $font-size-mini; diff --git a/app/javascript/dashboard/assets/scss/_foundation-settings.scss b/app/javascript/dashboard/assets/scss/_foundation-settings.scss index 8d6e63df9..b52cd265a 100644 --- a/app/javascript/dashboard/assets/scss/_foundation-settings.scss +++ b/app/javascript/dashboard/assets/scss/_foundation-settings.scss @@ -384,9 +384,9 @@ $label-background: lighten($primary-color, 40%); $label-color: $primary-color; $label-color-alt: $black; $label-palette: $foundation-palette; -$label-font-size: $font-size-micro; +$label-font-size: $font-size-mini; $label-padding: $space-smaller $space-small; -$label-radius: $space-micro; +$label-radius: var(--border-radius-small); // 21. Media Object // ---------------- diff --git a/app/javascript/dashboard/components/widgets/Label.stories.js b/app/javascript/dashboard/components/widgets/Label.stories.js new file mode 100644 index 000000000..e0fb89024 --- /dev/null +++ b/app/javascript/dashboard/components/widgets/Label.stories.js @@ -0,0 +1,58 @@ +import { action } from '@storybook/addon-actions'; + +export default { + title: 'Components/Label', + argTypes: { + title: { + defaultValue: 'sales', + control: { + type: 'text', + }, + }, + description: { + defaultValue: 'label', + control: { + type: 'text', + }, + }, + href: { + control: { + type: 'text', + }, + }, + bgColor: { + defaultValue: '#a83262', + control: { + type: 'text', + }, + }, + small: { + defaultValue: false, + control: { + type: 'boolean', + }, + }, + showIcon: { + defaultValue: false, + control: { + type: 'boolean', + }, + }, + icon: { + defaultValue: 'ion-close', + control: { + type: 'text', + }, + }, + }, +}; + +const Template = (args, { argTypes }) => ({ + props: Object.keys(argTypes), + template: '', +}); + +export const DefaultLabel = Template.bind({}); +DefaultLabel.args = { + onClick: action('clicked'), +}; diff --git a/app/javascript/dashboard/components/widgets/Label.vue b/app/javascript/dashboard/components/widgets/Label.vue index a272601d2..38a067cc0 100644 --- a/app/javascript/dashboard/components/widgets/Label.vue +++ b/app/javascript/dashboard/components/widgets/Label.vue @@ -62,13 +62,16 @@ export default { @import '~dashboard/assets/scss/variables'; .label { - display: inline-block; - font-size: $font-size-small; - line-height: 1; - margin: $space-micro; + font-weight: var(--font-weight-medium); + margin-right: var(--space-smaller); + margin-bottom: var(--space-smaller); &.small { - font-size: $font-size-mini; + font-size: var(--font-size-micro); + + .label--icon { + font-size: var(--font-size-nano); + } } a { @@ -80,8 +83,6 @@ export default { .label--icon { cursor: pointer; - font-size: $font-size-micro; - line-height: 1.5; - margin-left: $space-smaller; + font-size: var(--font-size-micro); }