AkkomaGang
/
akkoma-fe
4
13
Fork 56
Code Issues 76 Pull Requests 18 Projects Releases 1 Wiki Activity

Attachment CSS fixes.

This commit is contained in:
Roger Braun 2016-11-04 12:55:09 +01:00
parent 572aceb7e7
commit acc439f266
2 changed files with 58 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/App.scss
View File

@ -156,30 +156,6 @@ status.ng-enter.ng-enter-active {
margin: 1em; margin: 1em;
} }
.attachments {
display: flex;
flex-wrap: wrap;
}
.attachment, attachment {
flex: 1 0 30%;
display: flex;
margin: 0.2em;
align-self: flex-start;
img {
border: 1px solid;
border-radius: 0.5em;
width: 100%;
}
video {
border: 1px solid;
border-radius: 0.5em;
width: 100%;
}
}
.media-body { .media-body {
flex: 1 flex: 1

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

@ -25,54 +25,70 @@
<script src="./attachment.js"></script> <script src="./attachment.js"></script>
<style lang="scss"> <style lang="scss">
.attachment { .attachments {
video { display: flex;
height: 100%; flex-wrap: wrap;
} .attachment {
.oembed { flex: 1 0 30%;
img { display: flex;
width: 100%; margin: 0.2em;
height: 100%; align-self: flex-start;
}
}
.oembed { video {
border: 1px solid rgba(0, 0, 0, 0.14); height: 100%;
width: 100%; border: 1px solid;
border-radius: 0.5em;
width: 100%;
}
display: flex; .oembed {
.image { img {
flex: 1; width: 100%;
img { height: 100%;
border: 0px; }
border-radius: 0; }
}
}
.text { .oembed {
flex: 2; border: 1px solid rgba(0, 0, 0, 0.14);
margin: 8px; width: 100%;
h1 {
font-size: 14px;
margin: 0px;
a { display: flex;
color: black; .image {
} flex: 1;
} img {
} border: 0px;
} border-radius: 0;
}
}
a.image-attachment { .text {
display: flex; flex: 2;
flex: 1; margin: 8px;
h1 {
font-size: 14px;
margin: 0px;
img { a {
width: 100%; color: black;
height: 100%; }
flex: 1; }
} }
} }
a.image-attachment {
display: flex;
flex: 1;
img {
width: 100%;
height: 100%;
flex: 1;
border: 1px solid;
border-radius: 0.5em;
width: 100%;
}
}
}
} }
</style> </style>