diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-21 12:56:57 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-21 12:56:57 +0000 |
| commit | 118d60b871b790cfcf179b11a17af7d2787c8176 (patch) | |
| tree | 7c5d9d93b83da653e5e241ca7cc99b3e2aee3108 /src/components/attachment | |
| parent | 80203636803c3035a46d0d82c7778e4aff8d2612 (diff) | |
| parent | 4e07b89bcfb821afb65d39eb389bcb0b4de697c8 (diff) | |
Merge branch 'fix/fix-usercard-breaking-with-certain-colors-restructure' into 'develop'
Various fixes with usercard (and attachments), clean up
See merge request pleroma/pleroma-fe!170
Diffstat (limited to 'src/components/attachment')
| -rw-r--r-- | src/components/attachment/attachment.vue | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 20d10cce..57ff2625 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -34,6 +34,13 @@ display: flex; flex-wrap: wrap; margin-right: -0.7em; + + .attachment.media-upload-container { + flex: 0 0 auto; + max-height: 300px; + max-width: 100%; + } + .attachment { flex: 1 0 30%; margin: 0.5em 0.7em 0.6em 0.0em; @@ -82,9 +89,7 @@ img.media-upload { margin-bottom: -2px; max-height: 300px; - width: 100%; - height: 100%; - flex: 1; + max-width: 100%; } .oembed { |