diff --git a/README.md b/README.md index 36f47954..e07eca0d 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ Additionally, to work on the white labeling functionality, you need to edit your 127.0.0.1 sluice.localhost.com 127.0.0.1 lumenus.localhost.com 127.0.0.1 portfolioreview.localhost.com +127.0.0.1 23vivi.localhost.com ``` diff --git a/fonts/ascribe-font.eot b/fonts/ascribe-font.eot new file mode 100755 index 00000000..860c534b Binary files /dev/null and b/fonts/ascribe-font.eot differ diff --git a/fonts/ascribe-logo.svg b/fonts/ascribe-font.svg old mode 100644 new mode 100755 similarity index 90% rename from fonts/ascribe-logo.svg rename to fonts/ascribe-font.svg index 2a9bb79b..2628dfee --- a/fonts/ascribe-logo.svg +++ b/fonts/ascribe-font.svg @@ -3,7 +3,7 @@ \ No newline at end of file diff --git a/fonts/ascribe-font.ttf b/fonts/ascribe-font.ttf new file mode 100755 index 00000000..a66d8f04 Binary files /dev/null and b/fonts/ascribe-font.ttf differ diff --git a/fonts/ascribe-font.woff b/fonts/ascribe-font.woff new file mode 100755 index 00000000..7d18d089 Binary files /dev/null and b/fonts/ascribe-font.woff differ diff --git a/fonts/ascribe-logo.eot b/fonts/ascribe-logo.eot deleted file mode 100644 index 039f93f5..00000000 Binary files a/fonts/ascribe-logo.eot and /dev/null differ diff --git a/fonts/ascribe-logo.ttf b/fonts/ascribe-logo.ttf deleted file mode 100644 index 61cdce03..00000000 Binary files a/fonts/ascribe-logo.ttf and /dev/null differ diff --git a/fonts/ascribe-logo.woff b/fonts/ascribe-logo.woff deleted file mode 100644 index c563df56..00000000 Binary files a/fonts/ascribe-logo.woff and /dev/null differ diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js index fbc13a50..068b526c 100644 --- a/js/components/ascribe_detail/edition.js +++ b/js/components/ascribe_detail/edition.js @@ -244,7 +244,16 @@ let CoaDetails = React.createClass({ if(this.props.coa && this.props.coa.url_safe) { return (
); } else if(typeof this.props.coa === 'string'){ @@ -268,7 +277,7 @@ let CoaDetails = React.createClass({ } return ({getLangText("Just a sec, we\'re generating your COA")}
{getLangText('(you may leave the page)')}
api |
+ {getLangText('faq')} |
{getLangText('imprint')} |
{getLangText('terms of service')} |
{getLangText('privacy')}
diff --git a/js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js b/js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js
index a2a70a97..0fbca419 100644
--- a/js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js
+++ b/js/components/whitelabel/prize/portfolioreview/components/pr_register_piece.js
@@ -63,6 +63,11 @@ const PRRegisterPiece = React.createClass({
For more information, visit: + + portfolio-review.de + +
{getLangText("You're submitting as %s. ", currentUser.email)} {getLangText('Change account?')} diff --git a/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js b/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js index ebf2108d..302495a0 100644 --- a/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js +++ b/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js @@ -18,7 +18,7 @@ let Vivi23Landing = React.createClass({ }, componentWillMount() { - setDocumentTitle('23vivi Marketplace'); + setDocumentTitle('23VIVI Marketplace'); }, componentDidMount() { @@ -42,7 +42,7 @@ let Vivi23Landing = React.createClass({