summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-09-01 13:08:43 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-09-01 13:08:43 +0900
commit488bbc96510990afeb9afe3ce5e68e001d514e3e (patch)
treef2426dd8262dfe7556115de8e82a8b48e11bea3c /src/client
parentFix bug (diff)
downloadmisskey-488bbc96510990afeb9afe3ce5e68e001d514e3e.tar.gz
misskey-488bbc96510990afeb9afe3ce5e68e001d514e3e.tar.bz2
misskey-488bbc96510990afeb9afe3ce5e68e001d514e3e.zip
DeckでもURLプレビュー
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/common/views/components/url-preview.vue31
-rw-r--r--src/client/app/desktop/views/pages/deck/deck.note.vue1
2 files changed, 31 insertions, 1 deletions
diff --git a/src/client/app/common/views/components/url-preview.vue b/src/client/app/common/views/components/url-preview.vue
index 242d9ba5c6..d5dda0c80a 100644
--- a/src/client/app/common/views/components/url-preview.vue
+++ b/src/client/app/common/views/components/url-preview.vue
@@ -8,7 +8,7 @@
</blockquote>
</div>
<div v-else class="mk-url-preview">
- <a :href="url" target="_blank" :title="url" v-if="!fetching">
+ <a :class="{ mini }" :href="url" target="_blank" :title="url" v-if="!fetching">
<div class="thumbnail" v-if="thumbnail" :style="`background-image: url(${thumbnail})`"></div>
<article>
<header>
@@ -118,6 +118,12 @@ export default Vue.extend({
type: Boolean,
required: false,
default: false
+ },
+
+ mini: {
+ type: Boolean,
+ required: false,
+ default: false
}
},
@@ -293,6 +299,29 @@ root(isDark)
width 12px
height 12px
+ &.mini
+ font-size 10px
+
+ > .thumbnail
+ position relative
+ width 100%
+ height 60px
+
+ > article
+ left 0
+ width 100%
+ padding 8px
+
+ > header
+ margin-bottom 4px
+
+ > footer
+ margin-top 4px
+
+ > img
+ width 12px
+ height 12px
+
.mk-url-preview[data-darkmode]
root(true)
diff --git a/src/client/app/desktop/views/pages/deck/deck.note.vue b/src/client/app/desktop/views/pages/deck/deck.note.vue
index e6d062eac9..2615c0d090 100644
--- a/src/client/app/desktop/views/pages/deck/deck.note.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.note.vue
@@ -36,6 +36,7 @@
<div class="renote" v-if="p.renote">
<mk-note-preview :note="p.renote" :mini="true"/>
</div>
+ <mk-url-preview v-for="url in urls" :url="url" :key="url" :detail="false" :mini="true"/>
</div>
<span class="app" v-if="p.app">via <b>{{ p.app.name }}</b></span>
</div>