This commit is contained in:
syuilo
2018-05-04 16:27:03 +09:00
parent f62603fd9d
commit b5acf15877
18 changed files with 109 additions and 74 deletions

View File

@@ -14,12 +14,20 @@ import Vue from 'vue';
import MkMediaImageDialog from './media-image-dialog.vue';
export default Vue.extend({
props: ['image'],
props: {
image: {
type: Object,
required: true
},
raw: {
default: false
}
},
computed: {
style(): any {
return {
'background-color': this.image.properties.avgColor ? `rgb(${this.image.properties.avgColor.join(',')})` : 'transparent',
'background-image': `url(${this.image.url}?thumbnail&size=512)`
'background-image': this.raw ? `url(${this.image.url})` : `url(${this.image.url}?thumbnail&size=512)`
};
}
},

View File

@@ -52,6 +52,7 @@ export default Vue.extend({
width 100%
height 100%
border-radius 4px
.mk-media-video-thumbnail
display flex
justify-content center

View File

@@ -39,7 +39,7 @@
<mk-note-html v-if="p.text" :text="p.text" :i="os.i"/>
</div>
<div class="media" v-if="p.media.length > 0">
<mk-media-list :media-list="p.media"/>
<mk-media-list :media-list="p.media" :raw="true"/>
</div>
<mk-poll v-if="p.poll" :note="p"/>
<mk-url-preview v-for="url in urls" :url="url" :key="url"/>

View File

@@ -53,6 +53,7 @@ root(isDark)
> header
display flex
align-items baseline
white-space nowrap
> .name

View File

@@ -65,6 +65,7 @@ root(isDark)
> header
display flex
align-items baseline
margin-bottom 2px
white-space nowrap
line-height 21px

View File

@@ -400,7 +400,7 @@ root(isDark)
> header
display flex
align-items center
align-items baseline
margin-bottom 4px
white-space nowrap