summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-10-14 23:14:14 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-10-14 23:14:14 +0900
commit72b616a990872a6bc53fb3fb7155dd6ab8d7615d (patch)
tree2d8b98bd15d1463b15822cf6b63d44dbf22e32ad /src
parent:art: (diff)
downloadsharkey-72b616a990872a6bc53fb3fb7155dd6ab8d7615d.tar.gz
sharkey-72b616a990872a6bc53fb3fb7155dd6ab8d7615d.tar.bz2
sharkey-72b616a990872a6bc53fb3fb7155dd6ab8d7615d.zip
:art:
Diffstat (limited to 'src')
-rw-r--r--src/client/components/modal-page-window.vue2
-rw-r--r--src/client/components/page-window.vue2
-rw-r--r--src/client/ui/deck/column.vue2
-rw-r--r--src/client/ui/deck/main-column.vue1
4 files changed, 4 insertions, 3 deletions
diff --git a/src/client/components/modal-page-window.vue b/src/client/components/modal-page-window.vue
index cea92b9cb3..3ca7c31e0e 100644
--- a/src/client/components/modal-page-window.vue
+++ b/src/client/components/modal-page-window.vue
@@ -2,7 +2,7 @@
<MkModal ref="modal" @click="$emit('click')" @closed="$emit('closed')">
<div class="hrmcaedk _window _narrow_" :style="{ width: `${width}px`, height: (height ? `min(${height}px, 100%)` : '100%') }">
<div class="header" @contextmenu="onContextmenu">
- <button v-if="history.length > 0" class="_button" @click="back()"><i class="fas fa-arrow-left"></i></button>
+ <button v-if="history.length > 0" class="_button" @click="back()" v-tooltip="$ts.goBack"><i class="fas fa-arrow-left"></i></button>
<span v-else style="display: inline-block; width: 20px"></span>
<span v-if="pageInfo" class="title">
<i v-if="pageInfo.icon" class="icon" :class="pageInfo.icon"></i>
diff --git a/src/client/components/page-window.vue b/src/client/components/page-window.vue
index 620d288b14..904d13e0e8 100644
--- a/src/client/components/page-window.vue
+++ b/src/client/components/page-window.vue
@@ -14,7 +14,7 @@
</template>
</template>
<template #headerLeft>
- <button v-if="history.length > 0" class="_button" @click="back()"><i class="fas fa-arrow-left"></i></button>
+ <button v-if="history.length > 0" class="_button" @click="back()" v-tooltip="$ts.goBack"><i class="fas fa-arrow-left"></i></button>
</template>
<div class="yrolvcoq _flat_">
<component :is="component" v-bind="props" :ref="changePage"/>
diff --git a/src/client/ui/deck/column.vue b/src/client/ui/deck/column.vue
index 4f8d1632d9..c04297e384 100644
--- a/src/client/ui/deck/column.vue
+++ b/src/client/ui/deck/column.vue
@@ -362,7 +362,7 @@ export default defineComponent({
}
> .toggleActive,
- > .action > *,
+ > .action > ::v-deep(*),
> .menu {
z-index: 1;
width: var(--deckColumnHeaderHeight);
diff --git a/src/client/ui/deck/main-column.vue b/src/client/ui/deck/main-column.vue
index 4c1fa255a6..2127444769 100644
--- a/src/client/ui/deck/main-column.vue
+++ b/src/client/ui/deck/main-column.vue
@@ -2,6 +2,7 @@
<XColumn v-if="deckStore.state.alwaysShowMainColumn || $route.name !== 'index'" :column="column" :is-stacked="isStacked">
<template #header>
<template v-if="pageInfo">
+ <i :class="pageInfo.icon"></i>
{{ pageInfo.title }}
</template>
</template>