From 62b384824d39fb56cb211670126b38645fdf10cc Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 25 Sep 2016 14:58:07 +0200
Subject: Improved styling for media/videos in detailed status view

---
 .../components/features/status/components/detailed_status.jsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'app/assets/javascripts/components/features/status')

diff --git a/app/assets/javascripts/components/features/status/components/detailed_status.jsx b/app/assets/javascripts/components/features/status/components/detailed_status.jsx
index fbc9cb69b..ffa536ae8 100644
--- a/app/assets/javascripts/components/features/status/components/detailed_status.jsx
+++ b/app/assets/javascripts/components/features/status/components/detailed_status.jsx
@@ -30,6 +30,15 @@ const DetailedStatus = React.createClass({
 
   render () {
     const status = this.props.status.get('reblog') ? this.props.status.get('reblog') : this.props.status;
+    let media    = '';
+
+    if (status.get('media_attachments').size > 0) {
+      if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
+        media = <VideoPlayer media={status.getIn(['media_attachments', 0])} width={317} height={178} />;
+      } else {
+        media = <MediaGallery media={status.get('media_attachments')} height={300} />;
+      }
+    }
 
     return (
       <div style={{ background: '#2f3441', padding: '14px 10px' }} className='detailed-status'>
@@ -40,6 +49,8 @@ const DetailedStatus = React.createClass({
 
         <StatusContent status={status} />
 
+        {media}
+
         <div style={{ marginTop: '15px', color: '#616b86', fontSize: '14px', lineHeight: '18px' }}>
           <a className='detailed-status__datetime' style={{ color: 'inherit' }} href={status.get('url')} target='_blank' rel='noopener'>{moment(status.get('created_at')).format('HH:mm, DD MMM Y')}</a> · <i className='fa fa-retweet' /><span style={{ fontWeight: '500', fontSize: '12px', marginLeft: '6px', display: 'inline-block' }}>{status.get('reblogs_count')}</span> · <i className='fa fa-star' /><span style={{ fontWeight: '500', fontSize: '12px', marginLeft: '6px', display: 'inline-block' }}>{status.get('favourites_count')}</span>
         </div>
-- 
cgit