graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-23 18:53:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Tweak UI

Browse source
This commit is contained in:
syuilo 2021-04-11 12:31:24 +09:00
parent 1ec3338d2e
commit d4c4e30fe4
5 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/client/components/abuse-report-window.vue
View file

@ -9,18 +9,14 @@
</I18n> </I18n>
</template> </template>
<div class="dpvffvvy"> <div class="dpvffvvy">
<div class="_section"> <div class="_root">
<div class="_content"> <MkTextarea v-model:value="comment">
<MkTextarea v-model:value="comment"> <span>{{ $ts.details }}</span>
<span>{{ $ts.details }}</span> <template #desc>{{ $ts.fillAbuseReportDescription }}</template>
<template #desc>{{ $ts.fillAbuseReportDescription }}</template> </MkTextarea>
</MkTextarea>
</div>
</div> </div>
<div class="_section"> <div class="_root">
<div class="_content"> <MkButton @click="send" primary full :disabled="comment.length === 0">{{ $ts.send }}</MkButton>
<MkButton @click="send" primary full :disabled="comment.length === 0">{{ $ts.send }}</MkButton>
</div>
</div> </div>
</div> </div>
</XWindow> </XWindow>

2
src/client/components/drive.vue
View file

@ -11,7 +11,7 @@
<span class="folder current" v-if="folder != null">{{ folder.name }}</span> <span class="folder current" v-if="folder != null">{{ folder.name }}</span>
</div> </div>
</nav> </nav>
<div class="main _section" :class="{ uploading: uploadings.length > 0, fetching }" <div class="main" :class="{ uploading: uploadings.length > 0, fetching }"
ref="main" ref="main"
@dragover.prevent.stop="onDragover" @dragover.prevent.stop="onDragover"
@dragenter="onDragenter" @dragenter="onDragenter"

4
src/client/components/notification-setting-window.vue
View file

@ -9,13 +9,13 @@
@closed="$emit('closed')" @closed="$emit('closed')"
> >
<template #header>{{ $ts.notificationSetting }}</template> <template #header>{{ $ts.notificationSetting }}</template>
<div v-if="showGlobalToggle" class="_section"> <div v-if="showGlobalToggle" class="_root">
<MkSwitch v-model:value="useGlobalSetting"> <MkSwitch v-model:value="useGlobalSetting">
{{ $ts.useGlobalSetting }} {{ $ts.useGlobalSetting }}
<template #desc>{{ $ts.useGlobalSettingDesc }}</template> <template #desc>{{ $ts.useGlobalSettingDesc }}</template>
</MkSwitch> </MkSwitch>
</div> </div>
<div v-if="!useGlobalSetting" class="_section"> <div v-if="!useGlobalSetting" class="_root">
<MkInfo>{{ $ts.notificationSettingDesc }}</MkInfo> <MkInfo>{{ $ts.notificationSettingDesc }}</MkInfo>
<MkButton inline @click="disableAll">{{ $ts.disableAll }}</MkButton> <MkButton inline @click="disableAll">{{ $ts.disableAll }}</MkButton>
<MkButton inline @click="enableAll">{{ $ts.enableAll }}</MkButton> <MkButton inline @click="enableAll">{{ $ts.enableAll }}</MkButton>

10
src/client/style.scss
View file

@ -336,11 +336,21 @@ hr {
._hr { ._hr {
margin: var(--margin) calc(var(--root-margin, 32px) * -1); margin: var(--margin) calc(var(--root-margin, 32px) * -1);
border-top: solid 0.5px var(--divider);
} }
@media (max-width: 500px) { @media (max-width: 500px) {
--root-margin: 10px; --root-margin: 10px;
} }
& + ._root {
&:before {
content: "";
display: block;
margin: var(--root-margin) calc(var(--root-margin, 32px) * -1);
border-top: solid 0.5px var(--divider);
}
}
} }
._flat_ { ._flat_ {

9
src/client/ui/_common_/header.vue
View file

@ -99,7 +99,14 @@ export default defineComponent({
}, },
menu(ev) { menu(ev) {
const menu = this.info.menu ? this.info.menu() : []; let menu = this.info.menu ? this.info.menu() : [];
if (!this.showActions && this.info.actions) {
menu = [...this.info.actions.map(x => ({
text: x.text,
icon: x.icon,
action: x.handler
})), menu.length > 0 ? null : undefined, ...menu];
}
if (this.info.share) { if (this.info.share) {
if (menu.length > 0) menu.push(null); if (menu.length > 0) menu.push(null);
menu.push({ menu.push({