Merge branch 'develop' into sw-notification-action

This commit is contained in:
tamaina
2021-02-17 22:03:30 +09:00
committed by GitHub
14 changed files with 88 additions and 39 deletions

View File

@@ -200,6 +200,11 @@ export default defineComponent({
},
created() {
if (window.innerWidth < 1024) {
localStorage.setItem('ui', 'default');
location.reload();
}
router.beforeEach((to, from) => {
this.$refs.side.navigate(to.fullPath);
// search?q=foo のようなクエリを受け取れるようにするため、return falseはできない
@@ -414,10 +419,12 @@ export default defineComponent({
> .body {
flex: 1;
min-width: 0;
padding: 8px 0;
overflow: auto;
> .container {
margin-top: 8px;
margin-bottom: 8px;
& + .container {
margin-top: 16px;
}
@@ -426,10 +433,21 @@ export default defineComponent({
display: flex;
font-size: 0.9em;
padding: 8px 16px;
opacity: 0.7;
position: sticky;
top: 0;
background: var(--X17);
-webkit-backdrop-filter: blur(8px);
backdrop-filter: blur(8px);
z-index: 1;
color: var(--fgTransparentWeak);
> .add {
margin-left: auto;
color: var(--fgTransparentWeak);
&:hover {
color: var(--fg);
}
}
}
@@ -448,11 +466,11 @@ export default defineComponent({
&.active, &.active:hover {
background: var(--accent);
color: #fff;
color: #fff !important;
}
&.read {
opacity: 0.5;
color: var(--fgTransparent);
}
> .icon {
@@ -527,6 +545,7 @@ export default defineComponent({
> .instance {
margin-right: 16px;
font-size: 0.9em;
}
> .clock {

View File

@@ -65,21 +65,21 @@
</div>
<XReactionsViewer :note="appearNote" ref="reactionsViewer"/>
<footer class="footer _panel">
<button @click="reply()" class="button _button">
<button @click="reply()" class="button _button" v-tooltip="$ts.reply">
<template v-if="appearNote.reply"><Fa :icon="faReplyAll"/></template>
<template v-else><Fa :icon="faReply"/></template>
<p class="count" v-if="appearNote.repliesCount > 0">{{ appearNote.repliesCount }}</p>
</button>
<button v-if="canRenote" @click="renote()" class="button _button" ref="renoteButton">
<button v-if="canRenote" @click="renote()" class="button _button" ref="renoteButton" v-tooltip="$ts.renote">
<Fa :icon="faRetweet"/><p class="count" v-if="appearNote.renoteCount > 0">{{ appearNote.renoteCount }}</p>
</button>
<button v-else class="button _button">
<Fa :icon="faBan"/>
</button>
<button v-if="appearNote.myReaction == null" class="button _button" @click="react()" ref="reactButton">
<button v-if="appearNote.myReaction == null" class="button _button" @click="react()" ref="reactButton" v-tooltip="$ts.reaction">
<Fa :icon="faPlus"/>
</button>
<button v-if="appearNote.myReaction != null" class="button _button reacted" @click="undoReact(appearNote)" ref="reactButton">
<button v-if="appearNote.myReaction != null" class="button _button reacted" @click="undoReact(appearNote)" ref="reactButton" v-tooltip="$ts.reaction">
<Fa :icon="faMinus"/>
</button>
<button class="button _button" @click="menu()" ref="menuButton">
@@ -911,7 +911,7 @@ export default defineComponent({
align-items: center;
padding: 12px 16px 4px 16px;
line-height: 24px;
font-size: 90%;
font-size: 85%;
white-space: pre;
color: #d28a3f;

View File

@@ -64,6 +64,7 @@ import { noteVisibilities } from '../../../types';
import * as os from '@/os';
import { selectFile } from '@/scripts/select-file';
import { notePostInterruptors, postFormActions } from '@/store';
import { isMobile } from '@/scripts/is-mobile';
export default defineComponent({
components: {
@@ -541,7 +542,7 @@ export default defineComponent({
localOnly: this.localOnly,
visibility: this.visibility,
visibleUserIds: this.visibility == 'specified' ? this.visibleUsers.map(u => u.id) : undefined,
viaMobile: os.isMobile
viaMobile: isMobile
};
// plugin