diff --git a/app/javascript/dashboard/assets/scss/_foundation-settings.scss b/app/javascript/dashboard/assets/scss/_foundation-settings.scss index b52cd265a..1e4e07703 100644 --- a/app/javascript/dashboard/assets/scss/_foundation-settings.scss +++ b/app/javascript/dashboard/assets/scss/_foundation-settings.scss @@ -380,8 +380,8 @@ $form-button-radius: $global-radius; // 20. Label // --------- -$label-background: lighten($primary-color, 40%); -$label-color: $primary-color; +$label-background: $primary-color; +$label-color: $white; $label-color-alt: $black; $label-palette: $foundation-palette; $label-font-size: $font-size-mini; diff --git a/app/javascript/dashboard/components/index.js b/app/javascript/dashboard/components/index.js index 239fbd809..981d9d476 100644 --- a/app/javascript/dashboard/components/index.js +++ b/app/javascript/dashboard/components/index.js @@ -7,7 +7,7 @@ import Code from './Code'; import ColorPicker from './widgets/ColorPicker'; import DeleteModal from './widgets/modal/DeleteModal.vue'; import Input from './widgets/forms/Input.vue'; -import Label from './widgets/Label.vue'; +import Label from './ui/Label'; import LoadingState from './widgets/LoadingState'; import Modal from './Modal'; import ModalHeader from './ModalHeader'; diff --git a/app/javascript/dashboard/components/ui/Label.vue b/app/javascript/dashboard/components/ui/Label.vue new file mode 100644 index 000000000..6bbc7e6e8 --- /dev/null +++ b/app/javascript/dashboard/components/ui/Label.vue @@ -0,0 +1,148 @@ + + + + diff --git a/app/javascript/dashboard/components/widgets/Label.stories.js b/app/javascript/dashboard/components/ui/stories/Label.stories.js similarity index 86% rename from app/javascript/dashboard/components/widgets/Label.stories.js rename to app/javascript/dashboard/components/ui/stories/Label.stories.js index e0fb89024..38acc6258 100644 --- a/app/javascript/dashboard/components/widgets/Label.stories.js +++ b/app/javascript/dashboard/components/ui/stories/Label.stories.js @@ -9,6 +9,12 @@ export default { type: 'text', }, }, + colorScheme: { + control: { + type: 'select', + options: ['primary', 'secondary', 'success', 'alert', 'warning'], + }, + }, description: { defaultValue: 'label', control: { @@ -32,7 +38,7 @@ export default { type: 'boolean', }, }, - showIcon: { + showClose: { defaultValue: false, control: { type: 'boolean', diff --git a/app/javascript/dashboard/components/widgets/Label.vue b/app/javascript/dashboard/components/widgets/Label.vue deleted file mode 100644 index 38a067cc0..000000000 --- a/app/javascript/dashboard/components/widgets/Label.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - - diff --git a/app/javascript/dashboard/routes/dashboard/conversation/labels/AddLabelToConversation.vue b/app/javascript/dashboard/routes/dashboard/conversation/labels/AddLabelToConversation.vue index 5c897b372..bdae422a9 100644 --- a/app/javascript/dashboard/routes/dashboard/conversation/labels/AddLabelToConversation.vue +++ b/app/javascript/dashboard/routes/dashboard/conversation/labels/AddLabelToConversation.vue @@ -21,7 +21,7 @@ :title="label.title" :description="label.description" :bg-color="label.color" - :show-icon="true" + :show-close="true" @click="onRemove" /> @@ -44,7 +44,6 @@ :title="label.title" :description="label.description" :bg-color="label.color" - :show-icon="true" icon="ion-plus" @click="onAdd" />