Merge remote-tracking branch 'misskey-original/develop' into develop

This commit is contained in:
mattyatea 2024-03-12 23:21:16 +09:00
commit ad0265dcd0
10 changed files with 776 additions and 63 deletions

View file

@ -9,7 +9,10 @@ SPDX-License-Identifier: AGPL-3.0-only
<XTimeline class="tl"/>
<div class="shape1"></div>
<div class="shape2"></div>
<img :src="misskeysvg" class="misskey"/>
<div class="logo-wrapper">
<div class="powered-by">Powered by</div>
<img :src="misskeysvg" class="misskey"/>
</div>
<div class="emojis">
<MkEmoji :normal="true" :noStyle="true" emoji="👍"/>
<MkEmoji :normal="true" :noStyle="true" emoji="❤"/>
@ -119,14 +122,24 @@ misskeyApiGet('federation/instances', {
opacity: 0.5;
}
> .misskey {
> .logo-wrapper {
position: fixed;
top: 42px;
left: 42px;
width: 140px;
top: 36px;
left: 36px;
flex: auto;
color: #fff;
user-select: none;
pointer-events: none;
@media (max-width: 450px) {
width: 130px;
> .powered-by {
margin-bottom: 2px;
}
> .misskey {
width: 140px;
@media (max-width: 450px) {
width: 130px;
}
}
}