sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into sw-notification-action

Browse Source
This commit is contained in:
tamaina
2021-08-11 22:53:07 +09:00
parent 10e04a4bbe 9d138aa282
commit 90b735f588
938 changed files with 33452 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/ui/_common_/header.vue
View File

@@ -31,7 +31,7 @@
<script lang="ts">
import { defineComponent } from 'vue';
import { modalMenu } from '@client/os';
import { popupMenu } from '@client/os';
import { url } from '@client/config';
export default defineComponent({
@@ -121,7 +121,7 @@ export default defineComponent({
if (menu.length > 0) menu.push(null);
menu = menu.concat(this.menu);
}
modalMenu(menu, ev.currentTarget || ev.target);
popupMenu(menu, ev.currentTarget || ev.target);
}
}
});

8
src/client/ui/_common_/sidebar.vue
View File

@@ -150,7 +150,7 @@ export default defineComponent({
});
}));
os.modalMenu([...[{
os.popupMenu([...[{
type: 'link',
text: this.$ts.profile,
to: `/@${ this.$i.username }`,
@@ -159,7 +159,7 @@ export default defineComponent({
icon: 'fas fa-plus',
text: this.$ts.addAccount,
action: () => {
os.modalMenu([{
os.popupMenu([{
text: this.$ts.existingAccount,
action: () => { this.addAccount(); },
}, {
@@ -374,8 +374,8 @@ export default defineComponent({
padding-top: 8px;
padding-bottom: 8px;
background: var(--X14);
-webkit-backdrop-filter: blur(8px);
backdrop-filter: blur(8px);
-webkit-backdrop-filter: var(--blur, blur(8px));
backdrop-filter: var(--blur, blur(8px));
}
&:first-child {

6
src/client/ui/chat/index.vue
View File

@@ -55,7 +55,7 @@
<MkA to="/my/favorites" class="item"><i class="fas fa-star icon"></i>{{ $ts.favorites }}</MkA>
</div>
</div>
<MkAd class="a" prefer="square"/>
<MkAd class="a" :prefer="['square']"/>
</div>
<footer class="footer">
<div class="left">
@@ -373,8 +373,8 @@ export default defineComponent({
position: sticky;
top: 0;
background: var(--X17);
-webkit-backdrop-filter: blur(8px);
backdrop-filter: blur(8px);
-webkit-backdrop-filter: var(--blur, blur(8px));
backdrop-filter: var(--blur, blur(8px));
z-index: 1;
color: var(--fgTransparentWeak);

8
src/client/ui/chat/note.vue
View File

@@ -432,7 +432,7 @@ export default defineComponent({
pleaseLogin();
this.operating = true;
this.blur();
os.modalMenu([{
os.popupMenu([{
text: this.$ts.renote,
icon: 'fas fa-retweet',
action: () => {
@@ -726,7 +726,7 @@ export default defineComponent({
menu(viaKeyboard = false) {
this.operating = true;
os.modalMenu(this.getMenu(), this.$refs.menuButton, {
os.popupMenu(this.getMenu(), this.$refs.menuButton, {
viaKeyboard
}).then(() => {
this.operating = false;
@@ -736,7 +736,7 @@ export default defineComponent({
showRenoteMenu(viaKeyboard = false) {
if (!this.isMyRenote) return;
os.modalMenu([{
os.popupMenu([{
text: this.$ts.unrenote,
icon: 'fas fa-trash-alt',
danger: true,
@@ -780,7 +780,7 @@ export default defineComponent({
async clip() {
const clips = await os.api('clips/list');
os.modalMenu([{
os.popupMenu([{
icon: 'fas fa-plus',
text: this.$ts.createNew,
action: async () => {

2
src/client/ui/chat/pages/channel.vue
View File

@@ -178,7 +178,7 @@ export default defineComponent({
},
openChannelMenu(ev) {
os.modalMenu([{
os.popupMenu([{
text: this.$ts.copyUrl,
icon: 'fas fa-link',
action: () => {

2
src/client/ui/chat/post-form.vue
View File

@@ -593,7 +593,7 @@ export default defineComponent({
},
showActions(ev) {
os.modalMenu(postFormActions.map(action => ({
os.popupMenu(postFormActions.map(action => ({
text: action.title,
action: () => {
action.handler({

4
src/client/ui/chat/side.vue
View File

@@ -130,8 +130,8 @@ export default defineComponent({
width: 100%;
font-weight: bold;
//background-color: var(--panel);
-webkit-backdrop-filter: blur(32px);
backdrop-filter: blur(32px);
-webkit-backdrop-filter: var(--blur, blur(32px));
backdrop-filter: var(--blur, blur(32px));
background-color: var(--header);
border-bottom: solid 0.5px var(--divider);
box-sizing: border-box;

4
src/client/ui/deck/column.vue
View File

@@ -305,8 +305,8 @@ export default defineComponent({
&.naked {
background: var(--acrylicBg) !important;
-webkit-backdrop-filter: blur(10px);
backdrop-filter: blur(10px);
-webkit-backdrop-filter: var(--blur, blur(10px));
backdrop-filter: var(--blur, blur(10px));
> header {
background: transparent;

4
src/client/ui/default.header.vue
View File

@@ -116,7 +116,7 @@ export default defineComponent({
});
}));
os.modalMenu([...[{
os.popupMenu([...[{
type: 'link',
text: this.$ts.profile,
to: `/@${ this.$i.username }`,
@@ -125,7 +125,7 @@ export default defineComponent({
icon: 'fas fa-plus',
text: this.$ts.addAccount,
action: () => {
os.modalMenu([{
os.popupMenu([{
text: this.$ts.existingAccount,
action: () => { this.addAccount(); },
}, {

4
src/client/ui/default.side.vue
View File

@@ -138,8 +138,8 @@ export default defineComponent({
text-align: center;
font-weight: bold;
//background-color: var(--panel);
-webkit-backdrop-filter: blur(32px);
backdrop-filter: blur(32px);
-webkit-backdrop-filter: var(--blur, blur(32px));
backdrop-filter: var(--blur, blur(32px));
background-color: var(--header);
> ._button {

4
src/client/ui/default.sidebar.vue
View File

@@ -136,7 +136,7 @@ export default defineComponent({
});
}));
os.modalMenu([...[{
os.popupMenu([...[{
type: 'link',
text: this.$ts.profile,
to: `/@${ this.$i.username }`,
@@ -145,7 +145,7 @@ export default defineComponent({
icon: 'fas fa-plus',
text: this.$ts.addAccount,
action: () => {
os.modalMenu([{
os.popupMenu([{
text: this.$ts.existingAccount,
action: () => { this.addAccount(); },
}, {

16
src/client/ui/default.vue
View File

@@ -12,7 +12,7 @@
</div>
</template>
<main class="main _panel" @contextmenu.stop="onContextmenu">
<main class="main" @contextmenu.stop="onContextmenu">
<header class="header" @click="onHeaderClick">
<XHeader :info="pageInfo" :back-button="true" @back="back()"/>
</header>
@@ -240,7 +240,7 @@ export default defineComponent({
&.wallpaper {
background: var(--wallpaperOverlay);
//backdrop-filter: blur(4px);
//backdrop-filter: var(--blur, blur(4px));
}
&.isMobile {
@@ -292,7 +292,10 @@ export default defineComponent({
width: 750px;
margin: 0 16px 0 0;
background: var(--panel);
border-left: solid 1px var(--divider);
border-right: solid 1px var(--divider);
border-radius: 0;
overflow: clip;
--margin: 12px;
> .header {
@@ -300,8 +303,8 @@ export default defineComponent({
z-index: 1000;
top: var(--globalHeaderHeight, 0px);
height: $header-height;
-webkit-backdrop-filter: blur(32px);
backdrop-filter: blur(32px);
-webkit-backdrop-filter: var(--blur, blur(32px));
backdrop-filter: var(--blur, blur(32px));
background-color: var(--header);
border-bottom: solid 0.5px var(--divider);
}
@@ -343,6 +346,7 @@ export default defineComponent({
> .main {
margin-top: 0;
border: solid 1px var(--divider);
border-radius: var(--radius);
}
@@ -376,8 +380,8 @@ export default defineComponent({
display: flex;
width: 100%;
box-sizing: border-box;
-webkit-backdrop-filter: blur(32px);
backdrop-filter: blur(32px);
-webkit-backdrop-filter: var(--blur, blur(32px));
backdrop-filter: var(--blur, blur(32px));
background-color: var(--header);
border-top: solid 0.5px var(--divider);

2
src/client/ui/default.widgets.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="ddiqwdnk">
<XWidgets class="widgets" :edit="editMode" :widgets="$store.reactiveState.widgets.value.filter(w => w.place === place)" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/>
<MkAd class="a" prefer="square"/>
<MkAd class="a" :prefer="['square']"/>
<button v-if="editMode" @click="editMode = false" class="_textButton edit" style="font-size: 0.9em;"><i class="fas fa-check"></i> {{ $ts.editWidgetsExit }}</button>
<button v-else @click="editMode = true" class="_textButton edit" style="font-size: 0.9em;"><i class="fas fa-pencil-alt"></i> {{ $ts.editWidgets }}</button>

10
src/client/ui/universal.vue
View File

@@ -250,7 +250,7 @@ export default defineComponent({
&.wallpaper {
background: var(--wallpaperOverlay);
//backdrop-filter: blur(4px);
//backdrop-filter: var(--blur, blur(4px));
}
> .contents {
@@ -269,8 +269,8 @@ export default defineComponent({
text-align: center;
font-weight: bold;
//background-color: var(--panel);
-webkit-backdrop-filter: blur(32px);
backdrop-filter: blur(32px);
-webkit-backdrop-filter: var(--blur, blur(32px));
backdrop-filter: var(--blur, blur(32px));
background-color: var(--header);
//border-bottom: solid 0.5px var(--divider);
user-select: none;
@@ -341,8 +341,8 @@ export default defineComponent({
display: flex;
width: 100%;
box-sizing: border-box;
-webkit-backdrop-filter: blur(32px);
backdrop-filter: blur(32px);
-webkit-backdrop-filter: var(--blur, blur(32px));
backdrop-filter: var(--blur, blur(32px));
background-color: var(--header);
&:not(.navHidden) {

4
src/client/ui/visitor/header.vue
View File

@@ -90,8 +90,8 @@ export default defineComponent({
left: 0;
z-index: 1000;
line-height: $height;
-webkit-backdrop-filter: blur(32px);
backdrop-filter: blur(32px);
-webkit-backdrop-filter: var(--blur, blur(32px));
backdrop-filter: var(--blur, blur(32px));
background-color: var(--X16);
> .wide {

8
src/client/ui/visitor/kanban.vue
View File

@@ -122,8 +122,8 @@ export default defineComponent({
background: rgba(0, 0, 0, 0.3);
&.transparent {
-webkit-backdrop-filter: blur(12px);
backdrop-filter: blur(12px);
-webkit-backdrop-filter: var(--blur, blur(12px));
backdrop-filter: var(--blur, blur(12px));
}
}
@@ -140,8 +140,8 @@ export default defineComponent({
margin: 0 auto;
> .panel {
-webkit-backdrop-filter: blur(8px);
backdrop-filter: blur(8px);
-webkit-backdrop-filter: var(--blur, blur(8px));
backdrop-filter: var(--blur, blur(8px));
background: rgba(0, 0, 0, 0.5);
border-radius: var(--radius);

4
src/client/ui/zen.vue
View File

@@ -89,8 +89,8 @@ export default defineComponent({
line-height: $header-height;
text-align: center;
//background-color: var(--panel);
-webkit-backdrop-filter: blur(32px);
backdrop-filter: blur(32px);
-webkit-backdrop-filter: var(--blur, blur(32px));
backdrop-filter: var(--blur, blur(32px));
background-color: var(--header);
border-bottom: solid 0.5px var(--divider);
}