properer merge

This commit is contained in:
Jeremy Kauffman 2018-11-07 17:21:35 -05:00
parent 7bcaa5081b
commit b33c7b93a9
2 changed files with 115 additions and 110 deletions

View file

@ -71,8 +71,8 @@ class AssetDisplay extends React.Component {
} }
})() })()
} }
<AssetTitle />
</div> </div>
<AssetTitle />
</div> </div>
); );
} }

View file

@ -6,6 +6,7 @@ import Row from '@components/Row';
import SpaceBetween from '@components/SpaceBetween'; import SpaceBetween from '@components/SpaceBetween';
import AssetShareButtons from '@components/AssetShareButtons'; import AssetShareButtons from '@components/AssetShareButtons';
import ClickToCopy from '@components/ClickToCopy'; import ClickToCopy from '@components/ClickToCopy';
import HorizontalSplit from '@components/HorizontalSplit';
import siteConfig from '@config/siteConfig.json'; import siteConfig from '@config/siteConfig.json';
const { details: { host } } = siteConfig; const { details: { host } } = siteConfig;
@ -28,6 +29,16 @@ class AssetInfo extends React.Component {
channelCanonicalUrl = `${createCanonicalLink({channel})}`; channelCanonicalUrl = `${createCanonicalLink({channel})}`;
} }
return ( return (
<div className='asset-information-wrap'>
<HorizontalSplit
leftSide={
description && (
<Row>
<p>{description}</p>
</Row>
)
}
rightSide={
<div> <div>
{channelName && ( {channelName && (
<Row> <Row>
@ -134,19 +145,13 @@ class AssetInfo extends React.Component {
</a> </a>
</SpaceBetween> </SpaceBetween>
</Row> </Row>
</div>
{description && ( } />
<Row>
<p>{description}</p>
</Row>
)}
<Row> <Row>
<p> <p>
Hosted via the <a className={'link--primary'} href={'https://lbry.io/get'} target={'_blank'}>LBRY</a> blockchain Hosted via the <a className={'link--primary'} href={'https://lbry.io/get'} target={'_blank'}>LBRY</a> blockchain
</p> </p>
</Row> </Row>
</div> </div>
); );
} }