moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/attachment-sizing' into 'develop' 

Fix/attachment sizing

See merge request !67
This commit is contained in:
Shpuld Shpuldson 2017-04-09 07:50:02 -04:00
parent 0c7450252a 05dfd96571
commit d8387accd3
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/attachment/attachment.js
View File

@ -26,7 +26,7 @@ const Attachment = {
autoHeight () { autoHeight () {
if (this.type === 'image' && this.nsfw) { if (this.type === 'image' && this.nsfw) {
return { return {
'min-height': '311px' 'min-height': '109px'
} }
} }
} }

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

@ -116,8 +116,10 @@
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
border-radius: 5px; border-radius: 5px;
object-fit: contain;
width: 100%; width: 100%;
height: 100%; /* If this isn't here, chrome will stretch the images */ //height: 100%; /* If this isn't here, chrome will stretch the images */
max-height: 500px;
} }
} }
} }

5
src/components/status/status.vue
View File

@ -162,9 +162,12 @@
border-left: 4px rgba(255, 48, 16, 0.65); border-left: 4px rgba(255, 48, 16, 0.65);
border-left-style: inherit; border-left-style: inherit;
} }
.muted button { .muted {
padding: 0.1em 0.7em 0.1em 0.8em;
button {
margin-left: auto; margin-left: auto;
} }
}
a.unmute { a.unmute {
display: block; display: block;