Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

enhance: ダイアログのお知らせにも画像がある場合見せるように (MisskeyIO#157)

Browse source
This commit is contained in:
まっちゃとーにゅ 2023-08-23 00:59:45 +09:00 committed by GitHub
parent e1218de889
commit 001f6377d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/frontend/src/components/MkAnnouncementDialog.vue
View file

@ -15,7 +15,10 @@ SPDX-License-Identifier: AGPL-3.0-only
</span> </span>
<Mfm :text="announcement.title"/> <Mfm :text="announcement.title"/>
</div> </div>
<div :class="$style.content"><Mfm :text="announcement.text"/></div> <div :class="$style.content">
<Mfm :text="announcement.text"/>
<img v-if="announcement.imageUrl" :src="announcement.imageUrl"/>
</div>
<MkButton :class="$style.gotIt" primary full :disabled="gotItDisabled" @click="gotIt">{{ i18n.ts.gotIt }}<span v-if="secVisible"> ({{ sec }})</span></MkButton> <MkButton :class="$style.gotIt" primary full :disabled="gotItDisabled" @click="gotIt">{{ i18n.ts.gotIt }}<span v-if="secVisible"> ({{ sec }})</span></MkButton>
</div> </div>
</MkModal> </MkModal>
@ -109,6 +112,7 @@ onMounted(() => {
} }
.header { .header {
font-weight: bold;
font-size: 120%; font-size: 120%;
} }
@ -118,5 +122,10 @@ onMounted(() => {
.content { .content {
margin: 1em 0; margin: 1em 0;
> img {
display: block;
max-height: 300px;
max-width: 100%;
}
} }
</style> </style>

3
packages/frontend/src/pages/announcements.vue
View file

@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div :class="$style.content"> <div :class="$style.content">
<Mfm :text="announcement.text"/> <Mfm :text="announcement.text"/>
<img v-if="announcement.imageUrl" :src="announcement.imageUrl"/> <img v-if="announcement.imageUrl" :src="announcement.imageUrl"/>
<div style="opacity: 0.7; font-size: 85%;"> <div style="margin-top: 8px; opacity: 0.7; font-size: 85%;">
<MkTime :time="announcement.updatedAt ?? announcement.createdAt" mode="detail"/> <MkTime :time="announcement.updatedAt ?? announcement.createdAt" mode="detail"/>
</div> </div>
</div> </div>
@ -137,6 +137,7 @@ watch(() => $i?.unreadAnnouncements.length ?? 0, () => {
.header { .header {
margin-bottom: 16px; margin-bottom: 16px;
font-weight: bold; font-weight: bold;
font-size: 120%;
} }
.content { .content {