From 75fbde1c1a9d130f9228bef276cd5f360a90d3f1 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 6 Sep 2016 01:26:35 +0200 Subject: [PATCH] Fixed styling for media attachments in statuses (margins) --- .../components/components/media_gallery.jsx | 44 +++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/components/components/media_gallery.jsx b/app/assets/javascripts/components/components/media_gallery.jsx index b9ec309402..45d2f24920 100644 --- a/app/assets/javascripts/components/components/media_gallery.jsx +++ b/app/assets/javascripts/components/components/media_gallery.jsx @@ -16,16 +16,54 @@ const MediaGallery = React.createClass({ children = children.map((attachment, i) => { let width = 50; let height = 100; + let top = 'auto'; + let left = 'auto'; + let bottom = 'auto'; + let right = 'auto'; - if (size == 4 || (size === 3 && i > 0)) { + if (size === 4 || (size === 3 && i > 0)) { height = 50; } - return ; + if (size === 2) { + if (i === 0) { + right = '2px'; + } else { + left = '2px'; + } + } else if (size === 3) { + if (i === 0) { + right = '2px'; + } else if (i > 0) { + left = '2px'; + } + + if (i === 1) { + bottom = '2px'; + } else if (i > 1) { + top = '2px'; + } + } else if (size === 4) { + if (i === 0 || i === 2) { + right = '2px'; + } + + if (i === 1 || i === 3) { + left = '2px'; + } + + if (i < 2) { + bottom = '2px'; + } else { + top = '2px'; + } + } + + return ; }); return ( -
+
{children}
);