sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'fix/consistency-for-attachment-borders' into 'develop' 

Give link attachments a rounded border, give images and links base03 border.

See merge request !64
This commit is contained in:
Shpuld Shpuldson 2017-03-10 20:31:21 -05:00
parent 9e42472679 21111878be
commit 6aa4ab0d2b
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/attachment/attachment.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="attachment" :class="{[type]: true, loading}" :style="autoHeight"> <div class="attachment base03-border" :class="{[type]: true, loading}" :style="autoHeight">
<a class="image-attachment" v-if="hidden" @click.prevent="toggleHidden()"> <a class="image-attachment" v-if="hidden" @click.prevent="toggleHidden()">
<img :key="nsfwImage" :src="nsfwImage"/> <img :key="nsfwImage" :src="nsfwImage"/>
</a> </a>
@ -8,7 +8,7 @@
</div> </div>
<a v-if="type === 'image' && !hidden" class="image-attachment" :href="attachment.url" target="_blank"> <a v-if="type === 'image' && !hidden" class="image-attachment" :href="attachment.url" target="_blank">
<img class="base05-border" referrerpolicy="no-referrer" :src="attachment.large_thumb_url || attachment.url"/> <img class="base03-border" referrerpolicy="no-referrer" :src="attachment.large_thumb_url || attachment.url"/>
</a> </a>
<video v-if="type === 'video' && !hidden" :src="attachment.url" controls></video> <video v-if="type === 'video' && !hidden" :src="attachment.url" controls></video>
@ -76,19 +76,18 @@
border-radius: 5px; border-radius: 5px;
} }
.oembed { .oembed {
border: 1px solid;
border-radius: 5px;
border-color: inherit;
width: 100%;
margin-right: 15px;
display: flex;
img { img {
width: 100%; width: 100%;
} }
margin-right: 15px;
}
.oembed {
border: 1px solid;
width: 100%;
display: flex;
.image { .image {
flex: 1; flex: 1;
img { img {