annika/isl-vue3
1
0
Fork 0
mirror of https://forgejo.merr.is/annika/isl-vue3.git synced 2025-12-13 15:58:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

More Bug Fixes and Tooltip Adjustments

Browse source
This commit is contained in:
Annika Merris 2024-01-21 22:14:29 -05:00
parent 10684ad79c
commit d30bde5c4d
8 changed files with 66 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/items/fellowPowerItems.json
View file

@ -123,7 +123,7 @@
"maxItemPower": 50000, "maxItemPower": 50000,
"rarity": 4, "rarity": 4,
"origin": "Wrestling Championship", "origin": "Wrestling Championship",
"tooltip": "A champion's belt memorializing the time in the ring. Used ot increase a Fellow's Power by 20,000 to 50,000." "tooltip": "A champion's belt memorializing the time in the ring. Used to increase a Fellow's Power by 20,000 to 50,000."
}, },
"ed1663c2-aff0-41b4-b5ed-7f86463c1d69": { "ed1663c2-aff0-41b4-b5ed-7f86463c1d69": {
"iconURL": "", "iconURL": "",
@ -168,7 +168,7 @@
"maxItemPower": 8000, "maxItemPower": 8000,
"rarity": 1, "rarity": 1,
"origin": "Muscle Hustle Gym", "origin": "Muscle Hustle Gym",
"tooltip": "A pair of little dumbells. Even a b eginner can lift them easily after a little exerciase. Used to increase a Fellow's Power by 3,000 to 8,000." "tooltip": "A pair of little dumbells. Even a beginner can lift them easily after a little exerciase. Used to increase a Fellow's Power by 3,000 to 8,000."
}, },
"b282b9cb-1802-4563-88a1-e7e267a0bcd4": { "b282b9cb-1802-4563-88a1-e7e267a0bcd4": {
"iconURL": "", "iconURL": "",

2
public/items/intimacyPowerItems.json
View file

@ -69,7 +69,7 @@
"maxItemPower": 3, "maxItemPower": 3,
"rarity": 1, "rarity": 1,
"origin": "Camping Under the Stars", "origin": "Camping Under the Stars",
"tooltip": "" "tooltip": "\"The Warrior Star meets the Demon Star again~ Shall their difficult love in past lives be continued?\" Used to increase a Family Member's Intimacy by 1 to 3"
}, },
"b2536feb-7dcb-4cec-93e5-581bc64e693b": { "b2536feb-7dcb-4cec-93e5-581bc64e693b": {
"iconURL": "", "iconURL": "",

14
src/components/BlessingPower/SpecialItemsCard.vue
View file

@ -86,10 +86,10 @@ const getColor = computed(() => (rarity: number): string => {
:headers="headers" :headers="headers"
> >
<template v-slot:item.1.itemName="{ item }"> <template v-slot:item.1.itemName="{ item }">
<v-tooltip activator="parent" v-if="item[1].tooltip != undefined"> <v-tooltip activator="parent" v-if="item[1].tooltip != undefined" content-class="custom-tooltip">
<v-card variant="text" density="compact"> <v-card variant="text" density="compact" max-width="25vw">
<v-card-title>Origin: {{ item[1].origin }}</v-card-title> <v-card-title class="px-2">Origin: {{ item[1].origin }}</v-card-title>
<v-card-text>{{ item[1].tooltip }}</v-card-text> <v-card-text class="px-2" v-if="item[1].tooltip !== ''">{{ item[1].tooltip }}</v-card-text>
</v-card> </v-card>
</v-tooltip> </v-tooltip>
<v-chip :color="`${getColor(item[1].rarity)}`"> <v-chip :color="`${getColor(item[1].rarity)}`">
@ -134,3 +134,9 @@ const getColor = computed(() => (rarity: number): string => {
</v-card-item> </v-card-item>
</v-card> </v-card>
</template> </template>
<style lang="scss" scoped>
:global(.custom-tooltip) {
padding: 0 !important;
}
</style>

28
src/components/BlessingPower/StandardItemsCard.vue
View file

@ -69,20 +69,20 @@ const getColor = computed(() => (rarity: number): string => {
> >
<template v-slot:item.1.iconURL="{ item }"> <template v-slot:item.1.iconURL="{ item }">
<v-card class="my-2" elevation="2" rounded width="41"> <v-card class="my-2" elevation="2" rounded width="41">
<v-tooltip activator="parent" v-if="item[1].tooltip != undefined"> <v-tooltip activator="parent" v-if="item[1].tooltip != undefined" content-class="custom-tooltip">
<v-card variant="text" density="compact"> <v-card variant="text" density="compact" max-width="25vw">
<v-card-title>Origin: {{ item[1].origin }}</v-card-title> <v-card-title class="px-2">Origin: {{ item[1].origin }}</v-card-title>
<v-card-text>{{ item[1].tooltip }}</v-card-text> <v-card-text class="px-2" v-if="item[1].tooltip !== ''">{{ item[1].tooltip }}</v-card-text>
</v-card> </v-card>
</v-tooltip> </v-tooltip>
<v-img :src="`/images/${item[1].iconURL}`" height="41" width="41" cover></v-img> <v-img :src="`/images/${item[1].iconURL}`" height="41" width="41" cover></v-img>
</v-card> </v-card>
</template> </template>
<template v-slot:item.1.itemName="{ item }"> <template v-slot:item.1.itemName="{ item }">
<v-tooltip activator="parent" v-if="item[1].tooltip != undefined"> <v-tooltip activator="parent" v-if="item[1].tooltip != undefined" content-class="custom-tooltip">
<v-card variant="text" density="compact"> <v-card variant="text" density="compact" max-width="25vw">
<v-card-title>Origin: {{ item[1].origin }}</v-card-title> <v-card-title class="px-2">Origin: {{ item[1].origin }}</v-card-title>
<v-card-text>{{ item[1].tooltip }}</v-card-text> <v-card-text class="px-2" v-if="item[1].tooltip !== ''">{{ item[1].tooltip }}</v-card-text>
</v-card> </v-card>
</v-tooltip> </v-tooltip>
<v-chip :color="`${getColor(item[1].rarity)}`"> <v-chip :color="`${getColor(item[1].rarity)}`">
@ -104,7 +104,7 @@ const getColor = computed(() => (rarity: number): string => {
<tfoot> <tfoot>
<tr> <tr>
<td></td> <td></td>
<td></td> <td class="d-none d-lg-table-cell"></td>
<td></td> <td></td>
<td></td> <td></td>
<td class="px-0 text-right font-weight-bold">{{ standardBlessingItemTotal }}</td> <td class="px-0 text-right font-weight-bold">{{ standardBlessingItemTotal }}</td>
@ -115,3 +115,9 @@ const getColor = computed(() => (rarity: number): string => {
</v-card-item> </v-card-item>
</v-card> </v-card>
</template> </template>
<style lang="scss" scoped>
:global(.custom-tooltip) {
padding: 0 !important;
}
</style>

14
src/components/FellowPower/SpecialItemsCard.vue
View file

@ -86,10 +86,10 @@ const getColor = computed(() => (rarity: number): string => {
:headers="headers" :headers="headers"
> >
<template v-slot:item.1.itemName="{ item }"> <template v-slot:item.1.itemName="{ item }">
<v-tooltip activator="parent" v-if="item[1].tooltip != undefined"> <v-tooltip activator="parent" v-if="item[1].tooltip != undefined" content-class="custom-tooltip">
<v-card variant="text" density="compact"> <v-card variant="text" density="compact" max-width="25vw">
<v-card-title>Origin: {{ item[1].origin }}</v-card-title> <v-card-title class="px-2">Origin: {{ item[1].origin }}</v-card-title>
<v-card-text>{{ item[1].tooltip }}</v-card-text> <v-card-text class="px-2" v-if="item[1].tooltip !== ''">{{ item[1].tooltip }}</v-card-text>
</v-card> </v-card>
</v-tooltip> </v-tooltip>
<v-chip :color="`${getColor(item[1].rarity)}`"> <v-chip :color="`${getColor(item[1].rarity)}`">
@ -134,3 +134,9 @@ const getColor = computed(() => (rarity: number): string => {
</v-card-item> </v-card-item>
</v-card> </v-card>
</template> </template>
<style lang="scss" scoped>
:global(.custom-tooltip) {
padding: 0 !important;
}
</style>

14
src/components/FellowPower/StandardItemsCard.vue
View file

@ -62,10 +62,10 @@ const getColor = computed(() => (rarity: number): string => {
:headers="headers" :headers="headers"
> >
<template v-slot:item.1.itemName="{ item }"> <template v-slot:item.1.itemName="{ item }">
<v-tooltip activator="parent" v-if="item[1].tooltip != undefined"> <v-tooltip activator="parent" v-if="item[1].tooltip != undefined" content-class="custom-tooltip">
<v-card variant="text" density="compact"> <v-card variant="text" density="compact" max-width="25vw">
<v-card-title>Origin: {{ item[1].origin }}</v-card-title> <v-card-title class="px-2">Origin: {{ item[1].origin }}</v-card-title>
<v-card-text>{{ item[1].tooltip }}</v-card-text> <v-card-text class="px-2" v-if="item[1].tooltip !== ''">{{ item[1].tooltip }}</v-card-text>
</v-card> </v-card>
</v-tooltip> </v-tooltip>
<v-chip :color="`${getColor(item[1].rarity)}`"> <v-chip :color="`${getColor(item[1].rarity)}`">
@ -97,3 +97,9 @@ const getColor = computed(() => (rarity: number): string => {
</v-card-item> </v-card-item>
</v-card> </v-card>
</template> </template>
<style lang="scss" scoped>
:global(.custom-tooltip) {
padding: 0 !important;
}
</style>

22
src/components/IntimacyPower/SpecialItemsCard.vue
View file

@ -86,10 +86,10 @@ const getColor = computed(() => (rarity: number): string => {
:headers="headers" :headers="headers"
> >
<template v-slot:item.1.itemName="{ item }"> <template v-slot:item.1.itemName="{ item }">
<v-tooltip activator="parent" v-if="item[1].tooltip != undefined"> <v-tooltip activator="parent" v-if="item[1].tooltip != undefined" content-class="custom-tooltip">
<v-card variant="text" density="compact"> <v-card variant="text" density="compact" max-width="25vw">
<v-card-title>Origin: {{ item[1].origin }}</v-card-title> <v-card-title class="px-2">Origin: {{ item[1].origin }}</v-card-title>
<v-card-text>{{ item[1].tooltip }}</v-card-text> <v-card-text class="px-2" v-if="item[1].tooltip !== ''">{{ item[1].tooltip }}</v-card-text>
</v-card> </v-card>
</v-tooltip> </v-tooltip>
<v-chip :color="`${getColor(item[1].rarity)}`"> <v-chip :color="`${getColor(item[1].rarity)}`">
@ -133,17 +133,7 @@ const getColor = computed(() => (rarity: number): string => {
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
@use '@/styles/settings.scss'; :global(.custom-tooltip) {
.common { padding: 0 !important;
background-color: map-get(settings.$green, 'lighten-4');
}
.rare {
background-color: map-get(settings.$blue, 'lighten-4');
}
.epic {
background-color: map-get(settings.$purple, 'lighten-4');
}
.legendary {
background-color: map-get(settings.$amber, 'lighten-4');
} }
</style> </style>

14
src/components/IntimacyPower/StandardItemsCard.vue
View file

@ -62,10 +62,10 @@ const getColor = computed(() => (rarity: number): string => {
:headers="headers" :headers="headers"
> >
<template v-slot:item.1.itemName="{ item }"> <template v-slot:item.1.itemName="{ item }">
<v-tooltip activator="parent" v-if="item[1].tooltip != undefined"> <v-tooltip activator="parent" v-if="item[1].tooltip != undefined" content-class="custom-tooltip">
<v-card variant="text" density="compact"> <v-card variant="text" density="compact" max-width="25vw">
<v-card-title>Origin: {{ item[1].origin }}</v-card-title> <v-card-title class="px-2">Origin: {{ item[1].origin }}</v-card-title>
<v-card-text>{{ item[1].tooltip }}</v-card-text> <v-card-text class="px-2" v-if="item[1].tooltip !== ''">{{ item[1].tooltip }}</v-card-text>
</v-card> </v-card>
</v-tooltip> </v-tooltip>
<v-chip :color="`${getColor(item[1].rarity)}`"> <v-chip :color="`${getColor(item[1].rarity)}`">
@ -97,3 +97,9 @@ const getColor = computed(() => (rarity: number): string => {
</v-card-item> </v-card-item>
</v-card> </v-card>
</template> </template>
<style scoped lang="scss">
:global(.custom-tooltip) {
padding: 0 !important;
}
</style>