Skip to content

Commit

Permalink
fix: avatar can be dragged
Browse files Browse the repository at this point in the history
fix #274
  • Loading branch information
Tsuk1ko committed Jul 4, 2024
1 parent fbe440b commit 2fde73c
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 24 deletions.
2 changes: 1 addition & 1 deletion src/components/ArknItem.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<DataImg
class="arkn-item mdui-m-r-1 no-sl no-pe"
class="arkn-item mdui-m-r-1"
type="item"
:name="name"
:style="{ width: widthCss, height: widthCss }"
Expand Down
1 change: 1 addition & 0 deletions src/components/DataImg.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<img
class="no-sl no-pe"
:src="imgSrc"
:style="imgStyle"
:loading="loading"
Expand Down
7 changes: 2 additions & 5 deletions src/components/material/PresetSettingDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
>
<template v-if="sp">
<div class="mdui-card-header mdui-p-b-0">
<avatar
class="mdui-card-header-avatar mdui-color-grey-400 no-pe"
:name="selectedPresetName"
/>
<Avatar class="mdui-card-header-avatar mdui-color-grey-400" :name="selectedPresetName" />
<div class="mdui-card-header-title">{{ $t(`character.${selectedPresetName}`) }}</div>
</div>
<div class="mdui-card-content preset-list mdui-p-x-3">
Expand Down Expand Up @@ -65,7 +62,7 @@
}}</div></mdui-checkbox
>
<DataImg
class="skill-icon no-pe mdui-shadow-4"
class="skill-icon mdui-shadow-4"
type="skill"
:name="skill.icon || skill.name"
/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/material/PresetTodoDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="preset-todo" class="mdui-dialog" ref="dialog">
<template v-if="curPresetName">
<div class="mdui-dialog-title">
<avatar class="mdui-card-header-avatar mdui-color-grey-400 no-pe" :name="curPresetName" />
<Avatar class="mdui-card-header-avatar mdui-color-grey-400" :name="curPresetName" />
<div class="mdui-card-header-title">{{ $t(`character.${curPresetName}`) }}</div>
<div class="mdui-text-color-theme-secondary mdui-m-t-1 no-sl"
><small>{{ $t(`cultivate.todos.tips`) }}</small></div
Expand Down
2 changes: 1 addition & 1 deletion src/components/riic/SkillTr.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</td>
<td class="mdui-p-y-0">
<DataImg
class="building-skill-icon no-pe"
class="building-skill-icon"
type="building_skill"
:name="buildingBuff.data[skill.id].icon"
:lazy="true"
Expand Down
14 changes: 3 additions & 11 deletions src/views/Hr.vue
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
>
<div v-if="!isPub(char)" class="tag-triangle right-top"></div>
<div v-if="isPubOnly(char)" class="tag-triangle right-bottom"></div>
<avatar class="tag-avatar no-pe" v-if="setting.showAvatar" :name="char.name" />
<Avatar class="tag-avatar" v-if="setting.showAvatar" :name="char.name" />
<span>{{ $t(`character.${char.name}`) }}</span>
</button>
</td>
Expand Down Expand Up @@ -259,11 +259,7 @@
>
<div v-if="!isPub(char)" class="tag-triangle right-top"></div>
<div v-if="isPubOnly(char)" class="tag-triangle right-bottom"></div>
<avatar
class="tag-avatar no-pe"
v-if="setting.showAvatar"
:name="char.name"
/>
<Avatar class="tag-avatar" v-if="setting.showAvatar" :name="char.name" />
<span>{{ $t(`character.${char.name}`) }}</span>
</button>
</td>
Expand All @@ -280,11 +276,7 @@
<!-- 详细信息 -->
<mdui-dialog id="detail" class="mdui-card" ref="detailDialog">
<div v-if="detail" class="mdui-card-header mdui-p-b-0">
<avatar
class="mdui-card-header-avatar no-pe"
:key="`di-${detail.name}`"
:name="detail.name"
/>
<Avatar class="mdui-card-header-avatar" :key="`di-${detail.name}`" :name="detail.name" />
<div class="mdui-card-header-title mdui-m-t-1">
<span>{{ $t(`character.${detail.name}`) }}</span>
<button
Expand Down
9 changes: 4 additions & 5 deletions src/views/Material/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@
class="mdui-list-item mdui-p-y-0 mdui-p-x-1"
>
<div class="mdui-list-item-avatar lh-0"
><avatar
><Avatar
v-if="preset"
class="no-pe"
:key="`head-${props.item.text}`"
:name="props.item.name"
/></div>
Expand Down Expand Up @@ -144,7 +143,7 @@
:class="{ 'opacity-5': !$root.isReleasedChar(char.name) }"
@click="$refs.presetTodoDialog.open({ tag: char, index })"
>
<avatar class="mdui-chip-icon no-pe" :name="char.name" />
<Avatar class="mdui-chip-icon" :name="char.name" />
<span class="mdui-chip-title">{{ char.text }}</span>
</drag>
</template>
Expand Down Expand Up @@ -443,7 +442,7 @@
@click="showDropDetail(materialTable[materialName])"
>
<DataImg
class="material-image no-pe"
class="material-image"
type="item"
:name="materialTable[materialName].name"
/>
Expand Down Expand Up @@ -597,7 +596,7 @@
class="mdui-card-header-avatar mdui-valign pointer no-sl"
@click="showDropDetail(materialTable[material.name])"
>
<DataImg class="material-image no-pe" type="item" :name="material.name" />
<DataImg class="material-image" type="item" :name="material.name" />
</div>
<!-- 材料名 -->
<div
Expand Down

0 comments on commit 2fde73c

Please sign in to comment.