mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-12-18 08:38:09 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

format

Browse Source
This commit is contained in:
sparrow 2023-06-28 03:55:29 +01:00
parent a59017f1d6
commit 5fd27545c8
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/src/db/postgre.ts
View File

@ -211,7 +211,7 @@ export const db = new DataSource({
password: config.redis.pass,
keyPrefix: `${config.redis.prefix}:query:`,
db: config.redis.db || 0,
tls: config.redis.tls || {} ,
tls: config.redis.tls || {},
},
}
: false,

16
packages/client/src/components/MkReactionsViewer.vue
View File

@ -7,7 +7,7 @@
:count="count"
:is-initial="initialReactions.has(reaction)"
:note="note"
@reacted="reactionsEl.scrollTo(0,0)"
@reacted="reactionsEl.scrollTo(0, 0)"
/>
</div>
</template>
@ -37,8 +37,18 @@ const isMe = computed(() => $i && $i.id === props.note.userId);
overflow-x: auto;
margin-inline: -24px;
padding-inline: 22px 160px;
mask: linear-gradient(to right, transparent, black 24px calc(100% - 160px), transparent);
-webkit-mask: linear-gradient(to right, transparent, black 24px calc(100% - 160px), transparent);
mask: linear-gradient(
to right,
transparent,
black 24px calc(100% - 160px),
transparent
);
-webkit-mask: linear-gradient(
to right,
transparent,
black 24px calc(100% - 160px),
transparent
);
scrollbar-width: none;
&::-webkit-scrollbar {
display: none;

18
packages/client/src/pages/settings/general.vue
View File

@ -45,12 +45,18 @@
class="_formBlock"
>{{ i18n.ts.useReactionPickerForContextMenu }}</FormSwitch
>
<FormSwitch v-if="deviceKind !== 'desktop'" v-model="swipeOnMobile" class="_formBlock">{{
i18n.ts.swipeOnMobile
}}</FormSwitch>
<FormSwitch v-if="deviceKind === 'desktop'" v-model="swipeOnDesktop" class="_formBlock">{{
i18n.ts.swipeOnDesktop
}}</FormSwitch>
<FormSwitch
v-if="deviceKind !== 'desktop'"
v-model="swipeOnMobile"
class="_formBlock"
>{{ i18n.ts.swipeOnMobile }}</FormSwitch
>
<FormSwitch
v-if="deviceKind === 'desktop'"
v-model="swipeOnDesktop"
class="_formBlock"
>{{ i18n.ts.swipeOnDesktop }}</FormSwitch
>
<FormSwitch v-model="enterSendsMessage" class="_formBlock">{{
i18n.ts.enterSendsMessage
}}</FormSwitch>