diff --git a/public/assets/css/general.css b/public/assets/css/general.css index 1e6d5b86..b2005bd3 100644 --- a/public/assets/css/general.css +++ b/public/assets/css/general.css @@ -276,7 +276,7 @@ a, a:visited { vertical-align: top; } -.align-content-right { +.align-content-bottom { vertical-align: bottom; } @@ -495,7 +495,7 @@ table { padding: 1em; } -#asset-preview { +#dropzone-preview { display: block; width: 100%; } @@ -506,6 +506,20 @@ table { /* Assets */ +.asset-holder { + clear : both; + display: inline-block; + width : 31%; + padding: 0px; + margin : 1%; +} + +.asset-preview { + width : 100%; + padding: 0px; + margin : 0px +} + .asset { width: 100%; } diff --git a/react/components/AssetInfo/index.js b/react/components/AssetInfo/index.js index 30e5b0ae..79695e0e 100644 --- a/react/components/AssetInfo/index.js +++ b/react/components/AssetInfo/index.js @@ -155,7 +155,7 @@ class AssetInfo extends React.Component { }
- {this.state.showDetails ? '[less]' : '[more]'} +
); diff --git a/react/components/AssetPreview/index.js b/react/components/AssetPreview/index.js index e147a57d..0afe16d4 100644 --- a/react/components/AssetPreview/index.js +++ b/react/components/AssetPreview/index.js @@ -4,20 +4,8 @@ import { Link } from 'react-router-dom'; const AssetPreview = ({ name, claimId, fileExt, contentType }) => { const directSourceLink = `${claimId}/${name}.${fileExt}`; const showUrlLink = `${claimId}/${name}`; - const previewHolderStyle = { - clear : 'both', - display: 'inline-block', - width : '31%', - padding: '0px', - margin : '1%', - }; - const assetStyle = { - width : '100%', - padding: '0px', - margin : '0px', - }; return ( -
+
{(() => { switch (contentType) { @@ -25,15 +13,15 @@ const AssetPreview = ({ name, claimId, fileExt, contentType }) => { case 'image/jpg': case 'image/png': return ( - {name}/ + {name}/ ); case 'image/gif': return ( - {name}/ + {name}/ ); case 'video/mp4': return ( -
} diff --git a/react/containers/ShowChannel/view.jsx b/react/containers/ShowChannel/view.jsx index de79fa86..abee7a98 100644 --- a/react/containers/ShowChannel/view.jsx +++ b/react/containers/ShowChannel/view.jsx @@ -51,8 +51,8 @@ class ShowChannel extends React.Component {

channel name: {this.props.name ? this.props.name : 'loading...'}

-

full channel id: {this.props.longId ? this.props.longId : 'loading...'}

-

short channel id: {this.props.shortId ? this.props.shortId : 'loading...'}

+

full channel id: {this.props.longId ? this.props.longId : 'loading...'}

+

short channel id: {this.props.shortId ? this.props.shortId : 'loading...'}

{(this.props.name && this.props.longId) && }