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

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

Browse Source
This commit is contained in:
syuilo
2023-07-06 15:04:42 +09:00
parent 3597da5c49 4a7da723b3
commit 165c53a547
6 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/frontend/src/components/MkImgWithBlurhash.vue
View File

@@ -108,7 +108,7 @@ function waitForDecode() {
.then(() => {
loaded = true;
}, error => {
console.error('Error occured during decoding image', img.value, error);
console.error('Error occurred during decoding image', img.value, error);
throw Error(error);
});
} else {
@@ -180,7 +180,7 @@ async function draw() {
render(props.hash, work);
drawImage(work);
} catch (error) {
console.error('Error occured during drawing blurhash', error);
console.error('Error occurred during drawing blurhash', error);
}
}
}

16
packages/frontend/src/components/MkMediaImage.vue
View File

@@ -33,6 +33,7 @@
<div v-if="image.isSensitive" :class="$style.indicator" style="color: var(--warn);">NSFW</div>
</div>
<button :class="$style.menu" class="_button" @click.stop="showMenu"><i class="ti ti-dots" style="vertical-align: middle;"></i></button>
<i class="ti ti-eye-off" :class="$style.hide" @click.stop="hide = true"></i>
</template>
</div>
</template>
@@ -113,6 +114,21 @@ function showMenu(ev: MouseEvent) {
align-items: center;
}
.hide {
display: block;
position: absolute;
border-radius: 6px;
background-color: var(--fg);
color: var(--accentLighten);
font-size: 14px;
opacity: .5;
padding: 3px 6px;
text-align: center;
cursor: pointer;
top: 12px;
right: 12px;
}
.hiddenTextWrapper {
display: table-cell;
text-align: center;