diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-09-08 01:24:26 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-09-08 01:24:26 +0200 |
| commit | 0f4bc567195d368de596cdeeee6bc0b6507ae95e (patch) | |
| tree | b6ef5fbeb1103203dae8237d8b26379664a397f3 /app/assets | |
| parent | 87576e1ab1a4c02f8847e8264e6a62abd36df793 (diff) | |
Improving production logs, removing n+1 on media attachments in atom,
adding attachments display to static views
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/components/components/media_gallery.jsx | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/stream_entries.scss | 31 |
2 files changed, 31 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/components/media_gallery.jsx b/app/assets/javascripts/components/components/media_gallery.jsx index 45d2f2492..81bf7c87c 100644 --- a/app/assets/javascripts/components/components/media_gallery.jsx +++ b/app/assets/javascripts/components/components/media_gallery.jsx @@ -59,7 +59,7 @@ const MediaGallery = React.createClass({ } } - return <a key={attachment.get('id')} href={attachment.get('url')} style={{ boxSizing: 'border-box', position: 'relative', left: left, top: top, right: right, bottom: bottom, float: 'left', textDecoration: 'none', border: 'none', display: 'block', width: `${width}%`, height: `${height}%`, background: `url(${attachment.get('preview_url')}) no-repeat center`, backgroundSize: 'cover', cursor: 'zoom-in' }} />; + return <a key={attachment.get('id')} href={attachment.get('url')} target='_blank' style={{ boxSizing: 'border-box', position: 'relative', left: left, top: top, right: right, bottom: bottom, float: 'left', textDecoration: 'none', border: 'none', display: 'block', width: `${width}%`, height: `${height}%`, background: `url(${attachment.get('preview_url')}) no-repeat center`, backgroundSize: 'cover', cursor: 'zoom-in' }} />; }); return ( diff --git a/app/assets/stylesheets/stream_entries.scss b/app/assets/stylesheets/stream_entries.scss index 93880237c..25a536e24 100644 --- a/app/assets/stylesheets/stream_entries.scss +++ b/app/assets/stylesheets/stream_entries.scss @@ -158,7 +158,7 @@ font-size: 14px; padding: 0 10px; padding-left: 8px; - padding-bottom: 25px; + padding-bottom: 15px; color: #282c37; a { @@ -189,4 +189,33 @@ text-decoration: underline; } } + + .media-attachments { + list-style: none; + margin: 0; + padding: 0; + display: block; + overflow: hidden; + padding-left: 10px; + + li { + display: block; + float: left; + width: 120px; + height: 100px; + border-radius: 4px; + margin-right: 4px; + margin-bottom: 25px; + + a { + display: block; + width: 120px; + height: 100px; + border-radius: 4px; + background-position: center; + background-repeat: none; + background-size: cover; + } + } + } } |