summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/admin/views/announcements.vue6
-rw-r--r--src/client/app/common/views/components/avatar.vue1
-rw-r--r--src/client/app/common/views/components/user-list-editor.vue4
-rw-r--r--src/client/app/common/views/components/user-lists.vue4
-rw-r--r--src/client/app/common/views/widgets/broadcast.vue3
-rw-r--r--src/client/app/desktop/views/home/timeline.vue4
-rw-r--r--src/client/app/desktop/views/pages/welcome.vue3
-rw-r--r--src/client/app/mobile/views/components/note-detail.vue6
-rw-r--r--src/client/app/mobile/views/components/ui.nav.vue3
-rw-r--r--src/client/app/mobile/views/pages/welcome.vue3
-rw-r--r--src/client/app/theme.ts4
-rw-r--r--src/client/themes/vivid.json5 (renamed from src/client/themes/colorful.json5)2
12 files changed, 24 insertions, 19 deletions
diff --git a/src/client/app/admin/views/announcements.vue b/src/client/app/admin/views/announcements.vue
index 2e64e47d95..c1b2d6778d 100644
--- a/src/client/app/admin/views/announcements.vue
+++ b/src/client/app/admin/views/announcements.vue
@@ -9,6 +9,9 @@
<ui-textarea v-model="announcement.text">
<span>{{ $t('text') }}</span>
</ui-textarea>
+ <ui-input v-model="announcement.image">
+ <span>{{ $t('image-url') }}</span>
+ </ui-input>
<ui-horizon-group class="fit-bottom">
<ui-button @click="save()"><fa :icon="['far', 'save']"/> {{ $t('save') }}</ui-button>
<ui-button @click="remove(i)"><fa :icon="['far', 'trash-alt']"/> {{ $t('remove') }}</ui-button>
@@ -43,7 +46,8 @@ export default Vue.extend({
add() {
this.announcements.unshift({
title: '',
- text: ''
+ text: '',
+ image: null
});
},
diff --git a/src/client/app/common/views/components/avatar.vue b/src/client/app/common/views/components/avatar.vue
index 04f3ed9f78..cd02c6957d 100644
--- a/src/client/app/common/views/components/avatar.vue
+++ b/src/client/app/common/views/components/avatar.vue
@@ -78,6 +78,7 @@ export default Vue.extend({
.mk-avatar
display inline-block
vertical-align bottom
+ flex-shrink 0
&:not(.cat)
overflow hidden
diff --git a/src/client/app/common/views/components/user-list-editor.vue b/src/client/app/common/views/components/user-list-editor.vue
index 8d2e04d045..86024c4da3 100644
--- a/src/client/app/common/views/components/user-list-editor.vue
+++ b/src/client/app/common/views/components/user-list-editor.vue
@@ -77,11 +77,11 @@ export default Vue.extend({
input: {
default: this.list.name
}
- }).then(({ canceled, result: title }) => {
+ }).then(({ canceled, result: name }) => {
if (canceled) return;
this.$root.api('users/lists/update', {
listId: this.list.id,
- title: title
+ name: name
});
});
},
diff --git a/src/client/app/common/views/components/user-lists.vue b/src/client/app/common/views/components/user-lists.vue
index 786a6766d3..699251b313 100644
--- a/src/client/app/common/views/components/user-lists.vue
+++ b/src/client/app/common/views/components/user-lists.vue
@@ -28,10 +28,10 @@ export default Vue.extend({
this.$root.dialog({
title: this.$t('list-name'),
input: true
- }).then(async ({ canceled, result: title }) => {
+ }).then(async ({ canceled, result: name }) => {
if (canceled) return;
const list = await this.$root.api('users/lists/create', {
- title
+ name
});
this.lists.push(list)
diff --git a/src/client/app/common/views/widgets/broadcast.vue b/src/client/app/common/views/widgets/broadcast.vue
index f8897da253..7049945d55 100644
--- a/src/client/app/common/views/widgets/broadcast.vue
+++ b/src/client/app/common/views/widgets/broadcast.vue
@@ -18,7 +18,8 @@
<p class="fetching" v-if="fetching">{{ $t('fetching') }}<mk-ellipsis/></p>
<h1 v-if="!fetching">{{ announcements.length == 0 ? $t('no-broadcasts') : announcements[i].title }}</h1>
<p v-if="!fetching">
- <span v-if="announcements.length != 0" v-html="announcements[i].text"></span>
+ <mfm v-if="announcements.length != 0" :text="announcements[i].text"/>
+ <img v-if="announcements.length != 0 && announcements[i].image" :src="announcements[i].image" alt="" style="display: block; max-height: 130px; max-width: 100%;"/>
<template v-if="announcements.length == 0">{{ $t('have-a-nice-day') }}</template>
</p>
<a v-if="announcements.length > 1" @click="next">{{ $t('next') }} &gt;&gt;</a>
diff --git a/src/client/app/desktop/views/home/timeline.vue b/src/client/app/desktop/views/home/timeline.vue
index 1e6abac823..3f9681a047 100644
--- a/src/client/app/desktop/views/home/timeline.vue
+++ b/src/client/app/desktop/views/home/timeline.vue
@@ -123,10 +123,10 @@ export default Vue.extend({
this.$root.dialog({
title: this.$t('list-name'),
input: true
- }).then(async ({ canceled, result: title }) => {
+ }).then(async ({ canceled, result: name }) => {
if (canceled) return;
const list = await this.$root.api('users/lists/create', {
- title
+ name
});
this.list = list;
diff --git a/src/client/app/desktop/views/pages/welcome.vue b/src/client/app/desktop/views/pages/welcome.vue
index 5a5cd9c8e6..d7af82cd8d 100644
--- a/src/client/app/desktop/views/pages/welcome.vue
+++ b/src/client/app/desktop/views/pages/welcome.vue
@@ -44,7 +44,8 @@
<div v-if="announcements && announcements.length > 0">
<div v-for="announcement in announcements">
<h1 v-html="announcement.title"></h1>
- <div v-html="announcement.text"></div>
+ <mfm :text="announcement.text"/>
+ <img v-if="announcement.image" :src="announcement.image" alt="" style="display: block; max-height: 130px; max-width: 100%;"/>
</div>
</div>
</div>
diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue
index e14e1beff8..4b343491b8 100644
--- a/src/client/app/mobile/views/components/note-detail.vue
+++ b/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
diff --git a/src/client/app/mobile/views/components/ui.nav.vue b/src/client/app/mobile/views/components/ui.nav.vue
index b26e2380ab..1177cab4a0 100644
--- a/src/client/app/mobile/views/components/ui.nav.vue
+++ b/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>
diff --git a/src/client/app/mobile/views/pages/welcome.vue b/src/client/app/mobile/views/pages/welcome.vue
index dd71a918db..48a6650b4f 100644
--- a/src/client/app/mobile/views/pages/welcome.vue
+++ b/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">
diff --git a/src/client/app/theme.ts b/src/client/app/theme.ts
index 18ff82b9ec..b16fcdff4b 100644
--- a/src/client/app/theme.ts
+++ b/src/client/app/theme.ts
@@ -19,7 +19,7 @@ export const cafeTheme: Theme = require('../themes/cafe.json5');
export const japaneseSushiSetTheme: Theme = require('../themes/japanese-sushi-set.json5');
export const gruvboxDarkTheme: Theme = require('../themes/gruvbox-dark.json5');
export const monokaiTheme: Theme = require('../themes/monokai.json5');
-export const colorfulTheme: Theme = require('../themes/colorful.json5');
+export const vividTheme: Theme = require('../themes/vivid.json5');
export const rainyTheme: Theme = require('../themes/rainy.json5');
export const mauveTheme: Theme = require('../themes/mauve.json5');
export const grayTheme: Theme = require('../themes/gray.json5');
@@ -35,7 +35,7 @@ export const builtinThemes = [
japaneseSushiSetTheme,
gruvboxDarkTheme,
monokaiTheme,
- colorfulTheme,
+ vividTheme,
rainyTheme,
mauveTheme,
grayTheme,
diff --git a/src/client/themes/colorful.json5 b/src/client/themes/vivid.json5
index 5b7441e1cf..27bf742f3f 100644
--- a/src/client/themes/colorful.json5
+++ b/src/client/themes/vivid.json5
@@ -1,7 +1,7 @@
{
id: '2d066d6e-bd39-4f23-bd48-686d5c1c6ae8',
- name: 'Colorful',
+ name: 'Vivid',
author: 'syuilo',
base: 'light',
generated by cgit v1.2.3-freya (git 2.53.0.84.g453e7b744a) at 2026-04-22 09:50:42 +0000