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-02 08:46:51 +09:00
parent 22b55082f8 8bdf0dd135
commit 0319f95126
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/components/MkImgWithBlurhash.vue
View file

@ -1,5 +1,5 @@
<template> <template>
<div ref="root" :class="[$style.root, { [$style.cover]: cover }]" :title="title ?? ''"> <div ref="root" :class="['chromatic-ignore', $style.root, { [$style.cover]: cover }]" :title="title ?? ''">
<TransitionGroup <TransitionGroup
:duration="defaultStore.state.animation && props.transition?.duration || undefined" :duration="defaultStore.state.animation && props.transition?.duration || undefined"
:enterActiveClass="defaultStore.state.animation && props.transition?.enterActiveClass || undefined" :enterActiveClass="defaultStore.state.animation && props.transition?.enterActiveClass || undefined"

2
packages/frontend/src/style.scss
View file

@ -81,7 +81,7 @@ html {
tab-size: 2; tab-size: 2;
&, * { &, * {
scrollbar-color: var(--scrollbarHandle) inherit; scrollbar-color: var(--scrollbarHandle) transparent;
scrollbar-width: thin; scrollbar-width: thin;
&::-webkit-scrollbar { &::-webkit-scrollbar {

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

@ -304,6 +304,7 @@ function onDrop(ev) {
&::-webkit-scrollbar-track { &::-webkit-scrollbar-track {
background: transparent; background: transparent;
} }
scrollbar-color: var(--scrollbarHandle) transparent;
} }
} }
@ -316,6 +317,7 @@ function onDrop(ev) {
&::-webkit-scrollbar-track { &::-webkit-scrollbar-track {
background: inherit; background: inherit;
} }
scrollbar-color: var(--scrollbarHandle) transparent;
} }
} }
} }
@ -400,5 +402,6 @@ function onDrop(ev) {
&::-webkit-scrollbar-track { &::-webkit-scrollbar-track {
background: var(--panel); background: var(--panel);
} }
scrollbar-color: var(--scrollbarHandle) var(--panel);
} }
</style> </style>