summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-10-14 22:40:43 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-10-14 22:40:43 +0900
commit8ee4b180f994a84642995a44e62b405e566b114d (patch)
treea199bcd8f18955bc1b02a2cb1c9bb0f5e0880169 /src
parent:art: (diff)
downloadsharkey-8ee4b180f994a84642995a44e62b405e566b114d.tar.gz
sharkey-8ee4b180f994a84642995a44e62b405e566b114d.tar.bz2
sharkey-8ee4b180f994a84642995a44e62b405e566b114d.zip
:art:
Diffstat (limited to 'src')
-rw-r--r--src/client/components/global/header.vue11
-rw-r--r--src/client/ui/deck/column.vue3
-rw-r--r--src/server/web/manifest.json2
3 files changed, 6 insertions, 10 deletions
diff --git a/src/client/components/global/header.vue b/src/client/components/global/header.vue
index a283e1656c..492b77b1b4 100644
--- a/src/client/components/global/header.vue
+++ b/src/client/components/global/header.vue
@@ -1,7 +1,7 @@
<template>
<div class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick" ref="el">
<template v-if="info">
- <div class="titleContainer" @click="showTabsPopup">
+ <div class="titleContainer" @click="showTabsPopup" v-if="!hideTitle">
<i v-if="info.icon" class="icon" :class="info.icon"></i>
<MkAvatar v-else-if="info.avatar" class="avatar" :user="info.avatar" :disable-preview="true" :show-indicator="true"/>
@@ -17,7 +17,7 @@
</div>
</div>
</div>
- <div class="tabs" v-if="!narrow">
+ <div class="tabs" v-if="!narrow || hideTitle">
<button class="tab _button" v-for="tab in info.tabs" :class="{ active: tab.active }" @click="tab.onClick" v-tooltip="tab.title">
<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
<span v-if="!tab.iconOnly" class="title">{{ tab.title }}</span>
@@ -182,6 +182,7 @@ export default defineComponent({
showTabsPopup,
preventDrag,
onClick,
+ hideTitle: inject('shouldOmitHeaderTitle', false),
thin_: props.thin || inject('shouldHeaderThin', false)
};
},
@@ -210,12 +211,6 @@ export default defineComponent({
> .titleContainer {
margin: 0 auto;
}
-
- > .buttons {
- &.right {
- margin-left: 0;
- }
- }
}
> .buttons {
diff --git a/src/client/ui/deck/column.vue b/src/client/ui/deck/column.vue
index 59729e09f7..4f8d1632d9 100644
--- a/src/client/ui/deck/column.vue
+++ b/src/client/ui/deck/column.vue
@@ -38,7 +38,8 @@ import { deckStore } from './deck-store';
export default defineComponent({
provide: {
- shouldHeaderThin: true
+ shouldHeaderThin: true,
+ shouldOmitHeaderTitle: true,
},
props: {
diff --git a/src/server/web/manifest.json b/src/server/web/manifest.json
index 48030a2980..db97531bbf 100644
--- a/src/server/web/manifest.json
+++ b/src/server/web/manifest.json
@@ -2,7 +2,7 @@
"short_name": "Misskey",
"name": "Misskey",
"start_url": "/",
- "display": "standalone",
+ "display": "minimal-ui",
"background_color": "#313a42",
"theme_color": "#86b300",
"icons": [