Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-original/develop' into develop

Browse source 
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkNotifications.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/ui/_common_/navbar.vue
#	packages/frontend/src/ui/_common_/stream-indicator.vue
This commit is contained in:
mattyatea 2023-11-15 13:32:09 +09:00
commit d439dd66f9
68 changed files with 2145 additions and 1290 deletions
Download patch file Download diff file Expand all files Collapse all files

10
packages/frontend/src/ui/_common_/navbar.vue
View file

@ -260,7 +260,7 @@ function more(ev: MouseEvent) {
.bottom {
position: sticky;
bottom: 0;
padding: 20px 0;
padding-top: 20px;
background: var(--X14);
-webkit-backdrop-filter: var(--blur, blur(8px));
backdrop-filter: var(--blur, blur(8px));
@ -386,11 +386,10 @@ function more(ev: MouseEvent) {
position: relative;
display: flex;
align-items: center;
padding-left: 30px;
padding: 20px 0 20px 30px;
width: 100%;
text-align: left;
box-sizing: border-box;
margin-top: 16px;
overflow: clip;
}
@ -634,7 +633,7 @@ function more(ev: MouseEvent) {
.bottom {
position: sticky;
bottom: 0;
padding: 20px 0;
padding-top: 20px;
background: var(--X14);
-webkit-backdrop-filter: var(--blur, blur(8px));
backdrop-filter: var(--blur, blur(8px));
@ -646,7 +645,7 @@ function more(ev: MouseEvent) {
width: 100%;
color: black;
height: 52px;
margin-bottom: 16px;
text-align: center;
&:before {
@ -749,6 +748,7 @@ function more(ev: MouseEvent) {
.account {
display: block;
text-align: center;
padding: 20px 0;
width: 100%;
overflow: clip;
}

2
packages/frontend/src/ui/_common_/stream-indicator.vue
View file

@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { onUnmounted } from 'vue';
import { useStream, isReloading } from '@/stream.js';
import { useStream } from '@/stream.js';
import { i18n } from '@/i18n.js';
import MkButton from '@/components/MkButton.vue';
import * as os from '@/os.js';