logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: eb7156de0de7c713a1ac4975838c7081bc3afb39
parent: 2e874933a5c633d1f40abd342f5ecf969cb53d92
Author: Roger Braun <roger@rogerbraun.net>
Date:   Fri, 17 Feb 2017 10:16:29 +0100

Fix oembed attachments.

Diffstat:

Msrc/App.vue2+-
Msrc/components/attachment/attachment.vue7+++++--
Msrc/main.js2+-
3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue @@ -3,7 +3,7 @@ <nav class='container base01-background base04'> <div class='inner-nav' :style="logoStyle"> <div class='item'> - <a route-to='friends-timeline' href="#">{{sitename}}</a> + <router-link :to="{ name: 'root'}">{{sitename}}</router-link> </div> <div class='item right'> <router-link :to="{ name: 'settings'}"><i class="icon-cog"></i></router-link> diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue @@ -1,5 +1,5 @@ <template> - <div class="attachment"> + <div class="attachment" :class="type"> <a class="image-attachment" v-if="hidden" v-on:click.prevent="toggleHidden()"> <img :key="nsfwImage" :src="nsfwImage"></img> </a> @@ -42,6 +42,10 @@ margin: 0.2em; align-self: flex-start; + &.html { + flex-basis: 100%; + } + .hider { position: absolute; margin: 10px; @@ -74,7 +78,6 @@ .oembed { img { width: 100%; - height: 100%; } } diff --git a/src/main.js b/src/main.js @@ -44,7 +44,7 @@ const store = new Vuex.Store({ }) const routes = [ - { path: '/', redirect: '/main/all' }, + { name: 'root', path: '/', redirect: '/main/all' }, { path: '/main/all', component: PublicAndExternalTimeline }, { path: '/main/public', component: PublicTimeline }, { path: '/main/friends', component: FriendsTimeline },