diff --git a/client/scss/asset-display/_asset-display.scss b/client/scss/asset-display/_asset-display.scss index 2afe4f16..a3f84b26 100644 --- a/client/scss/asset-display/_asset-display.scss +++ b/client/scss/asset-display/_asset-display.scss @@ -33,10 +33,20 @@ height: 90vh; } -p.asset-description { - white-space: pre-line; - font-size: 14px; - color: #2E2F31; - letter-spacing: 0; - line-height: 18px; -} + +.asset-information-wrap { + max-width: 800px; + + p.asset-description { + white-space: pre-line; + font-size: 14px; + color: #2E2F31; + letter-spacing: 0; + line-height: 18px; + } + + .asset-information { + width: 320px; + } + +} \ No newline at end of file diff --git a/client/scss/click-to-copy/_click-to-copy.scss b/client/scss/click-to-copy/_click-to-copy.scss index ac80cda3..3c6bd191 100644 --- a/client/scss/click-to-copy/_click-to-copy.scss +++ b/client/scss/click-to-copy/_click-to-copy.scss @@ -1,14 +1,24 @@ -.click-to-copy { - cursor: pointer; - border: none; - padding: 0.5em; - margin: 0; - color: black; - background-color: white; - width: calc(100% - 1em - 2px); - font-size: 14px; - color: #2E2F31; - letter-spacing: -0.6px; - line-height: 20px; +.click-to-copy-wrap { + display: flex; + width: 100%; + justify-content: space-between; + .click-to-copy { + cursor: pointer; + border: none; + padding: 0.5em; + margin: 0; + color: black; + background-color: white; + width: calc(100% - 1em - 2px); + font-size: 14px; + color: #2E2F31; + letter-spacing: -0.6px; + line-height: 20px; + max-width: 200px; + } + svg { + stroke: $brand-color; + } } + diff --git a/client/scss/label/_label.scss b/client/scss/label/_label.scss index a801c8b6..c3d96ae3 100644 --- a/client/scss/label/_label.scss +++ b/client/scss/label/_label.scss @@ -2,6 +2,7 @@ padding-top: $thin-padding; padding-bottom: $thin-padding; display: inline-block; + font-size: 12px; } .label-radio { diff --git a/client/scss/text/_text.scss b/client/scss/text/_text.scss index cec1c28e..a8b72aa0 100644 --- a/client/scss/text/_text.scss +++ b/client/scss/text/_text.scss @@ -18,8 +18,8 @@ h3 { } p, body, button, input, textarea, label, select, option { - font-family: 'Lekton', monospace; - font-size: $text-large; + font-family: 'Lora', serif; + font-size: 16px; } .text--extra-large { diff --git a/client/src/components/ClickToCopy/index.jsx b/client/src/components/ClickToCopy/index.jsx index 35b7dba8..9c30d8be 100644 --- a/client/src/components/ClickToCopy/index.jsx +++ b/client/src/components/ClickToCopy/index.jsx @@ -1,4 +1,5 @@ import React from 'react'; +import * as Icon from 'react-feather'; class ClickToCopy extends React.Component { constructor (props) { @@ -18,15 +19,18 @@ class ClickToCopy extends React.Component { render () { const {id, value} = this.props; return ( - +
+ + +
); } } diff --git a/client/src/containers/AssetInfo/view.jsx b/client/src/containers/AssetInfo/view.jsx index d385b9c4..b150b488 100644 --- a/client/src/containers/AssetInfo/view.jsx +++ b/client/src/containers/AssetInfo/view.jsx @@ -125,7 +125,6 @@ class AssetInfo extends React.Component { } /> - ); } diff --git a/package-lock.json b/package-lock.json index f45c2e93..db4b9a57 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11090,6 +11090,11 @@ "prop-types": "15.6.2" } }, + "react-feather": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/react-feather/-/react-feather-1.1.3.tgz", + "integrity": "sha512-5+KHu7zp5qvc+zq6N0XjeZDhufl3NVEaQyocg486lXZ+ZwW9z66GO+HXABoZ74OCLjsqhBl48j4BS17VRfyjTQ==" + }, "react-ga": { "version": "2.5.3", "resolved": "https://registry.npmjs.org/react-ga/-/react-ga-2.5.3.tgz", diff --git a/package.json b/package.json index 524db99f..04a557c6 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ "prop-types": "^15.6.2", "react": "^16.4.2", "react-dom": "^16.4.2", + "react-feather": "^1.1.3", "react-ga": "^2.5.3", "react-helmet": "^5.2.0", "react-redux": "^5.0.6", diff --git a/server/render/renderFullPage.js b/server/render/renderFullPage.js index 0d3d0fc4..8f40e2b2 100644 --- a/server/render/renderFullPage.js +++ b/server/render/renderFullPage.js @@ -15,6 +15,7 @@ module.exports = (helmet, html, preloadedState) => { +
${html}
@@ -22,6 +23,7 @@ module.exports = (helmet, html, preloadedState) => { window.__PRELOADED_STATE__ = ${JSON.stringify(preloadedState).replace(/ + `;