From 0f2b08fc473deb061030c5b5332bae3db62cd056 Mon Sep 17 00:00:00 2001 From: Ben Haynes Date: Tue, 8 Sep 2020 13:11:50 -0400 Subject: [PATCH] fix dot display --- app/src/displays/color-dot/color-dot.vue | 15 +++++---------- app/src/displays/color-dot/index.ts | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/app/src/displays/color-dot/color-dot.vue b/app/src/displays/color-dot/color-dot.vue index 5e9434958d..6c5b5ff5b5 100644 --- a/app/src/displays/color-dot/color-dot.vue +++ b/app/src/displays/color-dot/color-dot.vue @@ -1,7 +1,7 @@ @@ -25,13 +25,9 @@ export default defineComponent({ type: Array as PropType, default: () => [], }, - defaultBackground: { + defaultColor: { type: String, - default: '#eceff1', - }, - defaultForeground: { - type: String, - default: '#263238', + default: '#B0BEC5', }, }, setup(props) { @@ -42,13 +38,12 @@ export default defineComponent({ }); const displayValue = computed(() => { - if (!currentChoice.value) return formatTitle(props.value); - return currentChoice.value.text; + return formatTitle(props.value); }); const styles = computed(() => { return { - backgroundColor: currentChoice.value?.color || props.defaultForeground, + backgroundColor: currentChoice.value?.color || props.defaultColor, }; }); diff --git a/app/src/displays/color-dot/index.ts b/app/src/displays/color-dot/index.ts index f38c0eb687..52104992ac 100644 --- a/app/src/displays/color-dot/index.ts +++ b/app/src/displays/color-dot/index.ts @@ -17,7 +17,7 @@ export default defineDisplay(({ i18n }) => ({ width: 'half', }, schema: { - default_value: '#eceff1', + default_value: '#B0BEC5', }, }, {