LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

Add unsaved resolved file conflicts

Browse source
This commit is contained in:
Shawn 2018-12-04 12:22:26 -06:00
parent d05cf1e71e
commit d089554fe4
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
client/src/components/AssetPreview/index.jsx
View file

@ -17,9 +17,6 @@ const AssetPreview = ({ defaultThumbnail, claimData }) => {
case 'image/jpg': case 'image/jpg':
case 'image/png': case 'image/png':
case 'image/gif': case 'image/gif':
if (pending) {
return null;
}
return ( return (
<Link to={showUrl} className='asset-preview'> <Link to={showUrl} className='asset-preview'>
<div> <div>
@ -36,7 +33,6 @@ const AssetPreview = ({ defaultThumbnail, claimData }) => {
return ( return (
<Link to={showUrl} className='asset-preview'> <Link to={showUrl} className='asset-preview'>
<div> <div>
<<<<<<< HEAD
<div className='asset-preview__play-wrapper'> <div className='asset-preview__play-wrapper'>
<img <img
className={'asset-preview__video'} className={'asset-preview__video'}
@ -46,15 +42,6 @@ const AssetPreview = ({ defaultThumbnail, claimData }) => {
<div className='asset-preview__play-overlay'></div> <div className='asset-preview__play-overlay'></div>
</div> </div>
<h3 className='asset-preview__title'>{title}</h3> <h3 className='asset-preview__title'>{title}</h3>
=======
{pending && <ClaimPending/>}
<img
className={'asset-preview-video'}
src={thumbnail || defaultThumbnail}
alt={name}
/>
<h3 className='list-title'>{title}</h3>
>>>>>>> add pending marker
</div> </div>
</Link> </Link>
); );