Merge branch 'develop'

src/client/app/mobile/views/components/note-detail.vue

@@ -215,11 +215,6 @@ export default Vue.extend({
 		@media (min-width 500px)
 			padding 28px 32px 18px 32px
 
-		&:after
-			content ""
-			display block
-			clear both
-
 		> header
 			display flex
 			line-height 1.1em
@@ -236,6 +231,7 @@ export default Vue.extend({
 					height 60px
 
 			> div
+				min-width 0
 
 				> .name
 					display inline-block

src/client/app/mobile/views/components/ui.nav.vue

@@ -43,7 +43,8 @@
 				<div class="announcements" v-if="announcements && announcements.length > 0">
 					<article v-for="announcement in announcements">
 						<span v-html="announcement.title" class="title"></span>
-						<div v-html="announcement.text"></div>
+						<mfm :text="announcement.text"/>
+						<img v-if="announcement.image" :src="announcement.image" alt="" style="display: block; max-height: 120px; max-width: 100%;"/>
 					</article>
 				</div>
 				<a :href="aboutUrl"><p class="about">{{ $t('about') }}</p></a>

src/client/app/mobile/views/pages/welcome.vue

@@ -29,7 +29,8 @@
 		<div class="announcements" v-if="announcements && announcements.length > 0">
 			<article v-for="announcement in announcements">
 				<span class="title" v-html="announcement.title"></span>
-				<div v-html="announcement.text"></div>
+				<mfm :text="announcement.text"/>
+				<img v-if="announcement.image" :src="announcement.image" alt="" style="display: block; max-height: 120px; max-width: 100%;"/>
 			</article>
 		</div>
 		<article class="about-misskey">