diff --git a/src/App.vue b/src/App.vue index 118466e..b5830a2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/src/components/item.vue b/src/components/item.vue index e1501be..8feb735 100644 --- a/src/components/item.vue +++ b/src/components/item.vue @@ -1,73 +1,85 @@ - - - - - \ No newline at end of file +}) + + \ No newline at end of file diff --git a/src/components/main.vue b/src/components/main.vue index 345eae2..acdbbbb 100644 --- a/src/components/main.vue +++ b/src/components/main.vue @@ -1,5 +1,5 @@ diff --git a/src/service/util.ts b/src/service/util.ts index d4abd52..23cb309 100644 --- a/src/service/util.ts +++ b/src/service/util.ts @@ -4,46 +4,52 @@ export const getRemainder = (n1: number, n2: number) => n1 % n2 >= 0 ? n1 % n2 : export const getRenderStyle = (element: any, gender: any) => ({ // todo: type wood: { yin: { - color: 'rgb(77, 245, 35)', - textDecoration: 'underline' + color: '#689C76', + fontWeight: 300, }, yang: { - color: 'rgb(77, 245, 35)', + color: '#689C76', + fontWeight: 700, }, }, fire: { yin: { - color: 'rgb(239, 79, 47)', - textDecoration: 'underline' + color: '#BE3E38', + fontWeight: 300, }, yang: { - color: 'rgb(239, 79, 47)' + color: '#BE3E38', + fontWeight: 700, }, }, earth: { yin: { - color: 'rgb(225, 171, 43)' + color: '#9D6621', + fontWeight: 300, }, yang: { - color: 'rgb(225, 171, 43)' + color: '#9D6621', + fontWeight: 700, }, }, metal: { yin: { - color: 'rgb(236, 252, 12)', - textDecoration: 'underline' + color: '#F6C543', + fontWeight: 300, }, yang: { - color: 'rgb(236, 252, 12)' + color: '#F6C543', + fontWeight: 700, }, }, water: { yin: { - color: 'rgb(35, 161, 239)', - textDecoration: 'underline' + color: '#67A1F8', + fontWeight: 300, }, yang: { - color: 'rgb(35, 161, 239)' + color: '#67A1F8', + fontWeight: 700, }, }, } as any)[element]![gender]