diff --git a/client/scss/all.scss b/client/scss/all.scss index 2f1447f5..4d12e3b5 100644 --- a/client/scss/all.scss +++ b/client/scss/all.scss @@ -30,6 +30,7 @@ @import '~page-content/_page-content'; @import '~progress-bar/_progress-bar'; @import '~publish-preview/_publish-preview'; +@import '~share-buttons/_share-buttons'; @import '~space-between/_space-between'; @import '~space-around/_space-around'; @import '~row/_row'; diff --git a/client/scss/asset-display/_asset-display.scss b/client/scss/asset-display/_asset-display.scss index 11d42c4c..1267501c 100644 --- a/client/scss/asset-display/_asset-display.scss +++ b/client/scss/asset-display/_asset-display.scss @@ -1,22 +1,184 @@ .asset-display { + background: #F6F6F6; display: flex; - flex: 1 0 auto; flex-direction: column; + flex: 1 0 auto; justify-content: center; + position: relative; + width: 100%; + + &:after { + background: transparent; + bottom: 0; + box-shadow: inset 0 1px 2px 2px $shadow-color; + content: ''; + height: 1px; + left: 0; + position: absolute; + top: auto; + width: 100%; + } +} + +.asset-title { + color: #2E2F31; + font-size: 26px; + font-weight: normal; + letter-spacing: 0; + line-height: 32px; + margin-top: 40px; + text-align: center; + + @media (max-width: $break-point-tablet) { + padding: 0 20px; + } } .asset-image, .asset-video { - margin : 0; - max-width: 100%; + margin: 60px auto; max-height: 100%; + max-width: 60vh; object-fit: contain; object-position: center; + + @media (max-width: $break-point-small) { + max-width: calc(100% - 30px); + } } + .asset-video { - border: 1px solid #d0d0d0; - margin: 16px; + border: none; + margin: 0px auto; + width: 100%; padding: 6px; } -.vertical-split .asset-display { - height: 90vh; + +.visible-content { + margin: 0; + padding-bottom: 30px; + position: relative; + width: 100%; + + &.closed { + box-shadow: none; + + &:after { + box-shadow: none; + } + } + + &:before{ + box-shadow: inset 2px 3px 3px 2px $shadow-color; + content: ''; + height: 100px; + position: absolute; + width: 100%; + z-index: 100; + } + + &:after { + box-shadow: 0px 2px 3px 2px $shadow-color; + content: ''; + height: 0; + position: absolute; + top: 100%; + width: 100%; + z-index: 100; + } } + +.asset-information-wrap { + max-width: 800px; + + @media (max-width: $break-point-tablet) { + margin: 0px auto; + max-width: 100%; + width: calc(100% - 80px); + } + + @media (max-width: $break-point-phone) { + width: calc(100% - 30px); + } + + .horizontal-split { + justify-content: center; + + .column { + padding-top: 40px; + + &:first-child { + border-right: 1px solid $grey-alt; + margin-right: -1px; + padding-right: 40px; + + @media (max-width: $break-point-tablet) { + border: none; + margin: 0; + order: 2; + padding: 0; + } + } + + &:last-child { + border-left: 1px solid $grey-alt; + padding-left: 60px; + + @media (max-width: $break-point-tablet) { + border: none; + margin: 0; + padding: 40px 0 0 0; + } + } + } + } + + p.asset-description { + color: #2E2F31; + font-size: 14px; + letter-spacing: 0; + line-height: 18px; + padding-bottom: 80px; + white-space: pre-line; + width: 360px; + + @media (max-width: $break-point-tablet) { + margin: 22px 0 60px; + max-width: 600px; + padding: 0; + width: 100%; + } + } + + .asset-information { + width: 320px; + + @media (max-width: $break-point-tablet) { + border-bottom: 1px solid $grey-alt; + min-width: 100%; + padding-bottom: 30px; + width: 100%; + } + } + +} + +.asset-footer { + border-top: 1px solid $grey-alt; + padding-bottom: 80px; + padding-top: 30px; + + @media (max-width: $break-point-tablet) { + padding-top: 22px; + padding-bottom: 0; + } + + .claim-address { + + .link--brand { + font-size: 14px; + font-weight: 300; + line-height: 18px; + } + } + +} \ No newline at end of file diff --git a/client/scss/body/_body.scss b/client/scss/body/_body.scss index 90f22258..6072cbd4 100644 --- a/client/scss/body/_body.scss +++ b/client/scss/body/_body.scss @@ -7,4 +7,4 @@ body { display: flex; -webkit-flex-direction: column; flex-direction: column; -} +} \ 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 a8dc776f..f66a571e 100644 --- a/client/scss/click-to-copy/_click-to-copy.scss +++ b/client/scss/click-to-copy/_click-to-copy.scss @@ -1,9 +1,35 @@ -.click-to-copy { +.click-to-copy-wrap { + display: flex; + width: 100%; + justify-content: space-between; + align-items: center; cursor: pointer; - border: 1px solid black; - padding: 0.5em; - margin: 0; - color: black; - background-color: white; - width: calc(100% - 1em - 2px); + border: 1px solid $grey-alt; + border-radius: 6px; + .click-to-copy { + border: none; + padding: 0.36em 0.5em; + margin: 0; + color: black; + background-color: transparent; + width: calc(100% - 1em - 2px); + font-size: 14px; + color: #2E2F31; + letter-spacing: -0.6px; + line-height: 20px; + letter-spacing: 0; + font-family: monospace; + border-right: 1px solid $grey-alt; + } + .icon-wrap { + width: 30px; + height: 30px; + line-height: 34px; + text-align: center; + svg { + stroke: $brand-color; + width: 16px; + height: 16px; + } + } } diff --git a/client/scss/font/Circular/CircularStd-Bold.ttf b/client/scss/font/Circular/CircularStd-Bold.ttf new file mode 100644 index 00000000..76eda84c Binary files /dev/null and b/client/scss/font/Circular/CircularStd-Bold.ttf differ diff --git a/client/scss/font/Circular/CircularStd-Book.ttf b/client/scss/font/Circular/CircularStd-Book.ttf new file mode 100644 index 00000000..b0bac769 Binary files /dev/null and b/client/scss/font/Circular/CircularStd-Book.ttf differ diff --git a/client/scss/font/_font.scss b/client/scss/font/_font.scss index a62312a0..279b7de7 100644 --- a/client/scss/font/_font.scss +++ b/client/scss/font/_font.scss @@ -16,3 +16,16 @@ font-weight: normal; font-style: italic; } + + +@font-face { + font-family: 'Circular'; + src: url('./font/Circular/CircularStd-Book.ttf'); + font-weight: normal; +} + +@font-face { + font-family: 'Circular'; + src: url('./font/Circular/CircularStd-Bold.ttf'); + font-weight: bold; +} \ No newline at end of file diff --git a/client/scss/horizontal-split/_horizontal-split.scss b/client/scss/horizontal-split/_horizontal-split.scss index bd304c3c..52034731 100644 --- a/client/scss/horizontal-split/_horizontal-split.scss +++ b/client/scss/horizontal-split/_horizontal-split.scss @@ -2,7 +2,7 @@ display : flex; flex-direction : row; justify-content: space-between; - align-items : flex-start; + .column { width: 50%; } @@ -10,13 +10,13 @@ -@media (max-width: $break-point-large ) { +@media (max-width: $break-point-tablet) { .horizontal-split { display : flex; flex-direction : column; justify-content: space-between; - align-items : flex-start; + .column { width: 100%; padding-left: 0; diff --git a/client/scss/icon/chevron-down.svg b/client/scss/icon/chevron-down.svg new file mode 100644 index 00000000..9144704e --- /dev/null +++ b/client/scss/icon/chevron-down.svg @@ -0,0 +1,9 @@ + + + + chevron-down + Created with Sketch. + + + + \ No newline at end of file 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/link/_link.scss b/client/scss/link/_link.scss index 4553605e..064c03f2 100644 --- a/client/scss/link/_link.scss +++ b/client/scss/link/_link.scss @@ -6,6 +6,10 @@ a, a:visited { color: $interactive-color; } +.link--brand, .link--brand:visited { + color: $brand-color; +} + .link--secondary, .link--secondary:visited { margin: 0px; padding: 0.3em; @@ -25,3 +29,50 @@ a, a:visited { color: $interactive-color; border-bottom: 2px solid $interactive-color; } + + +.link--icon, .link--icon:visited { + display: flex; + align-items: center; + + .link-text { + padding-bottom: 2px; + border-bottom: 1px solid transparent; + transition: all 0.2s ease; + } + .icon-wrap { + margin-left: 5px; + padding-top: 0px; + align-items: center; + svg { + width: 16px; + height: 16px; + stroke: $grey; + transition: all 0.2s ease; + } + + @media (max-width: $break-point-x-small) { + padding-top: 0; + } + } + &:hover { + .link-text { + border-bottom: 1px solid $brand-color; + } + svg { + stroke: $brand-color; + } + } +} + + +.link--hover { + display: inline-block; + padding-bottom: 2px; + border-bottom: 1px solid transparent; + transition: all 0.2s ease; + &:hover { + border-bottom: 1px solid $brand-color; + } +} + diff --git a/client/scss/nav-bar/_nav-bar.scss b/client/scss/nav-bar/_nav-bar.scss index 8d5e3f37..41415546 100644 --- a/client/scss/nav-bar/_nav-bar.scss +++ b/client/scss/nav-bar/_nav-bar.scss @@ -1,15 +1,27 @@ .nav-bar { padding-left: $primary-padding; padding-right: $primary-padding; - border-bottom: 0.5px solid $tertiary-color; + + @media (max-width: $break-point-phone) { + padding-left: 15px; + padding-right: 15px; + } + + // border-bottom: 0.5px solid $tertiary-color; .select--arrow { padding: 0 1.5em 0 $input-padding; + font-size: 14px; + letter-spacing: 0.4px; + text-transform: uppercase; } } .nav-bar-link { padding: calc(1em - 2px); display: inline-block; + font-size: 14px; + letter-spacing: 0.4px; + text-transform: uppercase; } .nav-bar-logo { @@ -23,6 +35,7 @@ padding-bottom: calc(1em - 2px); padding-left: 1em; } + } @media (max-width: $break-point-small ) { @@ -33,3 +46,5 @@ padding-left: 0.5em; } } + + diff --git a/client/scss/page-layout/_page-layout.scss b/client/scss/page-layout/_page-layout.scss index f94645a5..06f6dae7 100644 --- a/client/scss/page-layout/_page-layout.scss +++ b/client/scss/page-layout/_page-layout.scss @@ -7,6 +7,5 @@ display: flex; -webkit-flex-direction: column; flex-direction: column; - margin: $primary-padding; } } diff --git a/client/scss/row/_row.scss b/client/scss/row/_row.scss index 3b731ac0..787d5161 100644 --- a/client/scss/row/_row.scss +++ b/client/scss/row/_row.scss @@ -1,5 +1,5 @@ .row { - padding-bottom: 2em; + padding-bottom: 1.2em; } .row-labeled { @@ -18,6 +18,31 @@ width: 70%; } +.row-labeled-alt { + display: column; + flex-direction: row; + flex-wrap: nowrap; + justify-content: flex-start; + + .row-labeled-label { + align-self: flex-start; + width: 100%; + color: $grey; + .label { + font-weight: bold; + text-transform: uppercase; + font-size: 13px; + letter-spacing: 0.4px; + line-height: 18px; + } + } + + .row-labeled-content { + align-self: center; + width: 100%; + } +} + @media (max-width: $break-point-medium ) { @@ -33,3 +58,29 @@ } } + + +@media (max-width: $break-point-tablet) and (min-width: $break-point-phone) { + .row { + margin-bottom: 1.4em; + } + + .tablet-inline-row { + display: flex; + justify-content: space-between; + width: 100%; + + >.row { + flex: 1; + margin: 0 15px 1.4em; + + &:first-child { + margin-left: 0; + } + + &:last-child { + margin-right: 0; + } + } + } +} diff --git a/client/scss/select/_select.scss b/client/scss/select/_select.scss index df03a09e..7142f40c 100644 --- a/client/scss/select/_select.scss +++ b/client/scss/select/_select.scss @@ -10,7 +10,7 @@ select { .select--arrow { -moz-appearance:none; -webkit-appearance: none; - background: url('./icon/downArrow.svg') no-repeat right; + background: url('./icon/chevron-down.svg') no-repeat right; cursor: pointer; padding-right: 1.5em; padding-left: $input-padding diff --git a/client/scss/share-buttons/_share-buttons.scss b/client/scss/share-buttons/_share-buttons.scss new file mode 100644 index 00000000..010ef268 --- /dev/null +++ b/client/scss/share-buttons/_share-buttons.scss @@ -0,0 +1,51 @@ +.share-buttons { + display: flex; + align-items: center; + + a { + display: block; + width: 30px; + height: 30px; + margin: 0 7px; + border-radius: 100%; + line-height: 30px; + text-align: center; + transition: all 0.2s ease; + &.twitter { + background:#4DC2FE; + img { + margin-top: 8px; + margin-left: 2px; + } + } + + &.facebook { + background: #5487DE; + img { + margin-top: 6px; + } + } + + &.tumblr { + background: #274061; + img { + margin-top: 7px; + } + } + + &.reddit { + background: #FF4500; + img { + margin-top: 7px; + } + } + + &:first-child{ + margin-left: 0px; + } + + &:hover { + background: $brand-color; + } + } +} diff --git a/client/scss/text/_text.scss b/client/scss/text/_text.scss index cec1c28e..0c5b6140 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: 'Circular', serif; + font-size: 16px; } .text--extra-large { @@ -116,7 +116,7 @@ p, body, button, input, textarea, label, select, option { } p, body, button, input, textarea, label, select, option { - font-size: $text-small; + font-size: 15px; } .text--extra-large { @@ -146,7 +146,7 @@ p, body, button, input, textarea, label, select, option { } p, body, button, input, textarea, label, select, option { - font-size: $text-x-small; + font-size: 15px; } .text--extra-large { diff --git a/client/scss/variables/_variables.scss b/client/scss/variables/_variables.scss index 26f125d8..7698081e 100644 --- a/client/scss/variables/_variables.scss +++ b/client/scss/variables/_variables.scss @@ -5,6 +5,11 @@ $tertiary-color: #ccccc0; $interactive-color: blue; $success-color: green; $failure-color: red; +// $brand-color: #ff725d; +$brand-color: #1944F9; +$grey: #9095A5; +$grey-alt: #DDDFE4; +$shadow-color: rgba(169, 173, 186, 0.2); $primary-padding: 3em; $secondary-padding: 2em; @@ -32,7 +37,9 @@ $text-x-small: small; $break-point-xx-large: 1400px; $break-point-x-large: 1290px; $break-point-large: 1000px; +$break-point-tablet: 900px; $break-point-medium: 800px; +$break-point-phone: 640px; $break-point-small: 500px; $break-point-x-small: 400px; diff --git a/client/scss/vertical-split/_vertical-split.scss b/client/scss/vertical-split/_vertical-split.scss index ac100b08..3d6a15fc 100644 --- a/client/scss/vertical-split/_vertical-split.scss +++ b/client/scss/vertical-split/_vertical-split.scss @@ -5,3 +5,46 @@ justify-content: space-between; align-items : center; }; + +.collapse-content { + @media (max-width: $break-point-tablet) { + max-width: 100%; + width: 100%; + } +} + +.collapse-content.closed{ + display: none; +} + +.collapse-button { + outline: none; + background: none; + border: none; + display: block; + margin: 15px auto 0; + width: 25px; + height: 25px; + text-align: center; + padding: 0px; + padding-left: 10px; + + @media (max-width: $break-point-tablet) { + padding: 0; + } + + svg { + stroke: $brand-color; + &.plus-icon { + transform: rotate(0); + transition: all 0.4s ease; + } + + } + + &:hover { + .plus-icon { + transform: rotate(-180deg); + } + } +} \ No newline at end of file diff --git a/client/src/components/AssetShareButtons/index.js b/client/src/components/AssetShareButtons/index.js index 6ac868e5..3aeada29 100644 --- a/client/src/components/AssetShareButtons/index.js +++ b/client/src/components/AssetShareButtons/index.js @@ -5,32 +5,32 @@ const AssetShareButtons = ({ assetUrl, name }) => { return ( - twitter + - facebook + - tumblr + - reddit + + > + +
+ +
+ ); } } diff --git a/client/src/components/NavBar/index.jsx b/client/src/components/NavBar/index.jsx index bd1028a3..c58aa22d 100644 --- a/client/src/components/NavBar/index.jsx +++ b/client/src/components/NavBar/index.jsx @@ -10,7 +10,6 @@ class NavBar extends React.Component {
-
diff --git a/client/src/components/RowLabeledAlt/index.jsx b/client/src/components/RowLabeledAlt/index.jsx new file mode 100644 index 00000000..d5e2c7d0 --- /dev/null +++ b/client/src/components/RowLabeledAlt/index.jsx @@ -0,0 +1,14 @@ +import React from 'react'; + +class RowLabeledAlt extends React.Component { + render () { + return ( +
+
{this.props.label}
+
{this.props.content}
+
+ ); + } +} + +export default RowLabeledAlt; diff --git a/client/src/components/VerticalCollapsibleSplit/index.jsx b/client/src/components/VerticalCollapsibleSplit/index.jsx new file mode 100644 index 00000000..1dcaca48 --- /dev/null +++ b/client/src/components/VerticalCollapsibleSplit/index.jsx @@ -0,0 +1,38 @@ +import React from 'react'; +import * as Icon from 'react-feather'; +class VerticalCollapsibleSplit extends React.Component { + + constructor (props) { + super(props); + this.collapse = this.collapse.bind(this); + this.state = { closed: false }; + } + + collapse () { + this.setState({ closed: !this.state.closed }); + document.querySelectorAll(`[data-name='${this.props.name}']`).forEach(el => el.classList.toggle('closed')); + } + + render () { + let { + props, + state, + } = this; + + return ( +
+
+ {props.top} + +
+
+ {props.bottom} +
+
+ ); + } +}; + +export default VerticalCollapsibleSplit; diff --git a/client/src/containers/AssetDisplay/view.jsx b/client/src/containers/AssetDisplay/view.jsx index d5b37b82..be124f08 100644 --- a/client/src/containers/AssetDisplay/view.jsx +++ b/client/src/containers/AssetDisplay/view.jsx @@ -1,5 +1,6 @@ import React from 'react'; import Row from '@components/Row'; +import AssetTitle from '@containers/AssetTitle'; import ProgressBar from '@components/ProgressBar'; import { LOCAL_CHECK, UNAVAILABLE, ERROR, AVAILABLE } from '../../constants/asset_display_states'; @@ -12,62 +13,66 @@ class AssetDisplay extends React.Component { const { status, error, asset: { claimData: { name, claimId, contentType, fileExt, thumbnail } } } = this.props; const sourceUrl = `/${claimId}/${name}.${fileExt}`; return ( -
- {(status === LOCAL_CHECK) && -
-

Checking to see if Spee.ch has your asset locally...

-
- } - {(status === UNAVAILABLE) && -
-

Sit tight, we're searching the LBRY blockchain for your asset!

- -

Curious what magic is happening here? Learn more.

-
- } - {(status === ERROR) && -
- -

Unfortunately, we couldn't download your asset from LBRY. You can help us out by sharing the following error message in the LBRY discord.

-
- -

{error}

-
-
- } - {(status === AVAILABLE) && - (() => { - switch (contentType) { - case 'image/jpeg': - case 'image/jpg': - case 'image/png': - case 'image/gif': - return ( - {name} - ); - case 'video/mp4': - return ( - - ); - default: - return ( -

Unsupported content type

- ); +
+
+ {(status === LOCAL_CHECK) && +
+

Checking to see if Spee.ch has your asset locally...

+
} - })() - } + {(status === UNAVAILABLE) && +
+

Sit tight, we're searching the LBRY blockchain for your asset!

+ +

Curious what magic is happening here? Learn more.

+
+ } + {(status === ERROR) && +
+ +

Unfortunately, we couldn't download your asset from LBRY. You can help us out by sharing the following error message in the LBRY discord.

+
+ +

{error}

+
+
+ } + {(status === AVAILABLE) && + (() => { + switch (contentType) { + case 'image/jpeg': + case 'image/jpg': + case 'image/png': + case 'image/gif': + return ( + {name} + ); + case 'video/mp4': + return ( + + ); + default: + return ( +

Unsupported content type

+ ); + } + })() + } + +
); } diff --git a/client/src/containers/AssetInfo/view.jsx b/client/src/containers/AssetInfo/view.jsx index af742617..a9f35fd4 100644 --- a/client/src/containers/AssetInfo/view.jsx +++ b/client/src/containers/AssetInfo/view.jsx @@ -152,4 +152,4 @@ class AssetInfo extends React.Component { } }; -export default AssetInfo; +export default AssetInfo; \ No newline at end of file diff --git a/client/src/containers/AssetTitle/view.jsx b/client/src/containers/AssetTitle/view.jsx index a542c762..7821920a 100644 --- a/client/src/containers/AssetTitle/view.jsx +++ b/client/src/containers/AssetTitle/view.jsx @@ -1,11 +1,10 @@ import React from 'react'; -import Row from '@components/Row'; const AssetTitle = ({ title }) => { return ( - -

{title}

-
+
+

{title}

+
); }; diff --git a/client/src/pages/ShowAssetDetails/view.jsx b/client/src/pages/ShowAssetDetails/view.jsx index 98c09372..628dc5bc 100644 --- a/client/src/pages/ShowAssetDetails/view.jsx +++ b/client/src/pages/ShowAssetDetails/view.jsx @@ -1,8 +1,7 @@ import React from 'react'; import PageLayout from '@components/PageLayout'; -import HorizontalSplit from '@components/HorizontalSplit'; -import AssetTitle from '@containers/AssetTitle'; +import VerticalCollapsibleSplit from '@components/VerticalCollapsibleSplit'; import AssetDisplay from '@containers/AssetDisplay'; import AssetInfo from '@containers/AssetInfo'; import ErrorPage from '@pages/ErrorPage'; @@ -17,10 +16,10 @@ class ShowAssetDetails extends React.Component { pageTitle={`${name} - details`} asset={asset} > - - } - rightSide={} + } + bottom={} /> ); diff --git a/package-lock.json b/package-lock.json index 2763b1d6..84e6b947 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11579,6 +11579,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 c9db7135..88da5e3f 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,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/public/assets/img/facebook.svg b/public/assets/img/facebook.svg new file mode 100644 index 00000000..f86df4fc --- /dev/null +++ b/public/assets/img/facebook.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/img/icn_facebook.svg b/public/assets/img/icn_facebook.svg new file mode 100644 index 00000000..0b38fb12 --- /dev/null +++ b/public/assets/img/icn_facebook.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/img/icn_reddit.svg b/public/assets/img/icn_reddit.svg new file mode 100644 index 00000000..8e9cc967 --- /dev/null +++ b/public/assets/img/icn_reddit.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/img/icn_tumblr.svg b/public/assets/img/icn_tumblr.svg new file mode 100644 index 00000000..b1bd0dcf --- /dev/null +++ b/public/assets/img/icn_tumblr.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/img/icn_twitter.svg b/public/assets/img/icn_twitter.svg new file mode 100644 index 00000000..bd21672c --- /dev/null +++ b/public/assets/img/icn_twitter.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/img/reddit.svg b/public/assets/img/reddit.svg new file mode 100644 index 00000000..77c166e1 --- /dev/null +++ b/public/assets/img/reddit.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/img/tumblr.svg b/public/assets/img/tumblr.svg new file mode 100644 index 00000000..8c6e20be --- /dev/null +++ b/public/assets/img/tumblr.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/img/twitter.svg b/public/assets/img/twitter.svg new file mode 100644 index 00000000..e0f30445 --- /dev/null +++ b/public/assets/img/twitter.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/bundle/CircularStd-Bold-5b43235344fe2aee5bbbbe836e3acc7d.ttf b/public/bundle/CircularStd-Bold-5b43235344fe2aee5bbbbe836e3acc7d.ttf new file mode 100644 index 00000000..76eda84c Binary files /dev/null and b/public/bundle/CircularStd-Bold-5b43235344fe2aee5bbbbe836e3acc7d.ttf differ diff --git a/public/bundle/CircularStd-Book-5dfcf720810d073aff5add284e733c18.ttf b/public/bundle/CircularStd-Book-5dfcf720810d073aff5add284e733c18.ttf new file mode 100644 index 00000000..b0bac769 Binary files /dev/null and b/public/bundle/CircularStd-Book-5dfcf720810d073aff5add284e733c18.ttf differ diff --git a/server/render/renderFullPage.js b/server/render/renderFullPage.js index 0d3d0fc4..12e39214 100644 --- a/server/render/renderFullPage.js +++ b/server/render/renderFullPage.js @@ -15,6 +15,7 @@ module.exports = (helmet, html, preloadedState) => { +
${html}