diff options
| author | Shpuld Shpuldson <shpuld@gmail.com> | 2017-04-09 07:50:02 -0400 |
|---|---|---|
| committer | Shpuld Shpuldson <shpuld@gmail.com> | 2017-04-09 07:50:02 -0400 |
| commit | d8387accd3939fbaee26f720153c48ddd2a60e95 (patch) | |
| tree | 6c776bb455a2b0f17cccec248663aa776e8e32a0 | |
| parent | 0c7450252a3e42a5fc6488b0def26c5934fb0adb (diff) | |
| parent | 05dfd9657138f9cff555a65e76c67ecac0864af0 (diff) | |
Merge branch 'fix/attachment-sizing' into 'develop'
Fix/attachment sizing
See merge request !67
| -rw-r--r-- | src/components/attachment/attachment.js | 2 | ||||
| -rw-r--r-- | src/components/attachment/attachment.vue | 4 | ||||
| -rw-r--r-- | src/components/status/status.vue | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js index 7715add5..ccf26b79 100644 --- a/src/components/attachment/attachment.js +++ b/src/components/attachment/attachment.js @@ -26,7 +26,7 @@ const Attachment = { autoHeight () { if (this.type === 'image' && this.nsfw) { return { - 'min-height': '311px' + 'min-height': '109px' } } } diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 6af23391..e2fc65ba 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -116,8 +116,10 @@ border-style: solid; border-width: 1px; border-radius: 5px; + object-fit: contain; 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; } } } diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 62a55505..993ce796 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -162,8 +162,11 @@ border-left: 4px rgba(255, 48, 16, 0.65); border-left-style: inherit; } - .muted button { - margin-left: auto; + .muted { + padding: 0.1em 0.7em 0.1em 0.8em; + button { + margin-left: auto; + } } a.unmute { |