worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

Browse source
This commit is contained in:
NoriDev 2023-06-01 20:10:20 +09:00
parent af9712f006 23f272cc7d
commit f4e3cee6b9
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/frontend/src/pages/about-misskey.vue
View file

@ -245,6 +245,12 @@ const patronsWithIconWithMisskey = [{
}, { }, {
name: 'かみらえっと', name: 'かみらえっと',
icon: 'https://misskey-hub.net/patrons/be1326bda7d940a482f3758ffd9ffaf6.jpg', icon: 'https://misskey-hub.net/patrons/be1326bda7d940a482f3758ffd9ffaf6.jpg',
}, {
name: 'へてて',
icon: 'https://misskey-hub.net/patrons/0431eacd7c6843d09de8ea9984307e86.jpg',
}, {
name: 'spinlock',
icon: 'https://misskey-hub.net/patrons/6a1cebc819d540a78bf20e9e3115baa8.jpg',
}]; }];
const patronsWithCherryPick = [ const patronsWithCherryPick = [

2
packages/frontend/src/store.ts
View file

@ -337,7 +337,7 @@ export const defaultStore = markRaw(new Storage('base', {
}, },
enableCondensedLineForAcct: { enableCondensedLineForAcct: {
where: 'device', where: 'device',
default: true, default: false,
}, },
useEnterToSend: { useEnterToSend: {
where: 'device', where: 'device',

2
packages/frontend/src/ui/deck/column.vue
View file

@ -381,7 +381,7 @@ function onDrop(ev) {
height: var(--deckColumnHeaderHeight); height: var(--deckColumnHeaderHeight);
cursor: move; cursor: move;
user-select: none; user-select: none;
opacity: 0.7; opacity: 0.5;
} }
.menu { .menu {