moris/misskey
1
0
Fork 0
forked from mirror/misskey
Code Pull Requests Activity

Fix fields (#3596)

Browse Source
This commit is contained in:
MeiMei 2018-12-12 02:46:40 +09:00 committed by syuilo
parent d18d1cb958
commit df297d0031
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/client/app/desktop/views/pages/deck/deck.user-column.vue
View File

@ -28,7 +28,9 @@
</div> </div>
<div class="fields" v-if="user.fields"> <div class="fields" v-if="user.fields">
<dl class="field" v-for="(field, i) in user.fields" :key="i"> <dl class="field" v-for="(field, i) in user.fields" :key="i">
<dt class="name">{{ field.name }}</dt> <dt class="name">
<misskey-flavored-markdown :text="field.name" :shouldBreak="false" :plainText="true" :custom-emojis="user.emojis"/>
</dt>
<dd class="value"> <dd class="value">
<misskey-flavored-markdown :text="field.value" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/> <misskey-flavored-markdown :text="field.value" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
</dd> </dd>
@ -431,6 +433,7 @@ export default Vue.extend({
display flex display flex
padding 0 padding 0
margin 0 margin 0
align-items center
> .name > .name
padding 4px padding 4px

5
src/client/app/desktop/views/pages/user/user.header.vue
View File

@ -20,7 +20,9 @@
</div> </div>
<div class="fields" v-if="user.fields"> <div class="fields" v-if="user.fields">
<dl class="field" v-for="(field, i) in user.fields" :key="i"> <dl class="field" v-for="(field, i) in user.fields" :key="i">
<dt class="name">{{ field.name }}</dt> <dt class="name">
<misskey-flavored-markdown :text="field.name" :shouldBreak="false" :plainText="true" :custom-emojis="user.emojis"/>
</dt>
<dd class="value"> <dd class="value">
<misskey-flavored-markdown :text="field.value" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/> <misskey-flavored-markdown :text="field.value" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
</dd> </dd>
@ -189,6 +191,7 @@ export default Vue.extend({
display flex display flex
padding 0 padding 0
margin 0 margin 0
align-items center
> .name > .name
border-right solid 1px var(--faceDivider) border-right solid 1px var(--faceDivider)

5
src/client/app/mobile/views/pages/user.vue
View File

@ -26,7 +26,9 @@
</div> </div>
<div class="fields" v-if="user.fields"> <div class="fields" v-if="user.fields">
<dl class="field" v-for="(field, i) in user.fields" :key="i"> <dl class="field" v-for="(field, i) in user.fields" :key="i">
<dt class="name">{{ field.name }}</dt> <dt class="name">
<misskey-flavored-markdown :text="field.name" :shouldBreak="false" :plainText="true" :custom-emojis="user.emojis"/>
</dt>
<dd class="value"> <dd class="value">
<misskey-flavored-markdown :text="field.value" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/> <misskey-flavored-markdown :text="field.value" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
</dd> </dd>
@ -316,6 +318,7 @@ main
display flex display flex
padding 0 padding 0
margin 0 margin 0
align-items center
> .name > .name
padding 4px padding 4px