Merge pull request #2403 from syuilo/greenkeeper/summaly-2.1.4

Update summaly to the latest version 🚀
This commit is contained in:
syuilo 2018-08-23 00:45:44 +09:00 committed by GitHub
commit baa71070a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions

View file

@ -191,7 +191,7 @@
"style-loader": "0.22.1",
"stylus": "0.54.5",
"stylus-loader": "3.0.2",
"summaly": "2.1.3",
"summaly": "2.1.4",
"systeminformation": "3.42.9",
"syuilo-password-strength": "0.0.1",
"textarea-caret": "3.1.0",

View file

@ -1,5 +1,7 @@
<template>
<iframe v-if="player" :src="player" heigth="250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen />
<div v-if="player.url" class="player" :style="`padding: ${(player.height || 0) / (player.width || 1) * 100}% 0 0`">
<iframe :src="player.url" :width="player.width || '100%'" :heigth="player.height || 250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen />
</div>
<div v-else-if="tweetUrl && detail" class="twitter">
<blockquote ref="tweet" class="twitter-tweet" :data-theme="$store.state.device.darkmode ? 'dark' : null">
<a :href="url"></a>
@ -46,7 +48,11 @@ export default Vue.extend({
thumbnail: null,
icon: null,
sitename: null,
player: null,
player: {
url: null,
width: null,
height: null
},
tweetUrl: null,
misskeyUrl
};
@ -170,7 +176,15 @@ export default Vue.extend({
</script>
<style lang="stylus" scoped>
iframe
.twitter
position relative
width 100%
> iframe
height 100%
left 0
position absolute
top 0
width 100%
root(isDark)