Merge pull request #2484 from LiskHQ/2471-update-fonts

Update the fonts - Closes #2471
LiskHQ · Sep 26, 2019 · f310fe0 · f310fe0
2 parents 3b67833 + 2538f6c
commit f310fe0
Show file tree

Hide file tree

Showing 22 changed files with 15 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,7 @@ reports
 test/cypress/screenshots/
 test/cypress/videos/
 .history
+
+## Commercial fonts
+src/assets/fonts/basier-circle/*
+src/assets/fonts/gilroy/*
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -31,6 +31,12 @@ pipeline {
 						withCredentials([string(credentialsId: 'github-lisk-token', variable: 'GH_TOKEN')]) {
 							nvm(getNodejsVersion()) {
 								sh '''
+								if stat /home/lisk/fonts/basier-circle/* > /dev/null ; then
+									cp /home/lisk/fonts/basier-circle/* src/assets/fonts/basier-circle/
+								fi
+								if stat /home/lisk/fonts/gilroy/* > /dev/null ; then
+									cp /home/lisk/fonts/gilroy/* src/assets/fonts/gilroy/
+								fi
 								npm run --silent build
 								npm run --silent build:testnet
 								npm run --silent bundlesize

diff --git a/README.md b/README.md
@@ -44,6 +44,11 @@ localStorage.setItem('hwWalletAutoLogin', true);
 npm run build
 ```
 
+#### Using Commercial Fonts
+Since some of the fonts used in the production version are commercial, this repository only contains open source fonts and uses `Open Sans` as a replacement for the commercial ones.
+
+If you have licensed copies of `Basier Circle` and `Gilroy`, you can add them to [fonts folder](./src/assets/fonts) to replace the empty files that are there so that webpack build doesn't fail if the fonts are not present.
+
 ## Electron
 
 #### Start

diff --git a/src/assets/fonts/basier-circle/basiercircle-medium.otf b/src/assets/fonts/basier-circle/basiercircle-medium.otf
diff --git a/src/assets/fonts/basier-circle/basiercircle-medium.woff b/src/assets/fonts/basier-circle/basiercircle-medium.woff
diff --git a/src/assets/fonts/basier-circle/basiercircle-medium.woff2 b/src/assets/fonts/basier-circle/basiercircle-medium.woff2
diff --git a/src/assets/fonts/basier-circle/basiercircle-regular.otf b/src/assets/fonts/basier-circle/basiercircle-regular.otf
diff --git a/src/assets/fonts/basier-circle/basiercircle-regular.woff b/src/assets/fonts/basier-circle/basiercircle-regular.woff
diff --git a/src/assets/fonts/basier-circle/basiercircle-regular.woff2 b/src/assets/fonts/basier-circle/basiercircle-regular.woff2
diff --git a/src/assets/fonts/basier-circle/basiercircle-semibold.otf b/src/assets/fonts/basier-circle/basiercircle-semibold.otf
diff --git a/src/assets/fonts/basier-circle/basiercircle-semibold.woff b/src/assets/fonts/basier-circle/basiercircle-semibold.woff
diff --git a/src/assets/fonts/basier-circle/basiercircle-semibold.woff2 b/src/assets/fonts/basier-circle/basiercircle-semibold.woff2
diff --git a/src/assets/fonts/gilroy/gilroy-Medium.otf b/src/assets/fonts/gilroy/gilroy-Medium.otf
diff --git a/src/assets/fonts/gilroy/gilroy-bold.eot b/src/assets/fonts/gilroy/gilroy-bold.eot
diff --git a/src/assets/fonts/gilroy/gilroy-bold.ttf b/src/assets/fonts/gilroy/gilroy-bold.ttf
diff --git a/src/assets/fonts/gilroy/gilroy-bold.woff b/src/assets/fonts/gilroy/gilroy-bold.woff
diff --git a/src/assets/fonts/gilroy/gilroy-bold.woff2 b/src/assets/fonts/gilroy/gilroy-bold.woff2
diff --git a/src/assets/fonts/gilroy/gilroy-extra-bold.eot b/src/assets/fonts/gilroy/gilroy-extra-bold.eot
diff --git a/src/assets/fonts/gilroy/gilroy-extra-bold.ttf b/src/assets/fonts/gilroy/gilroy-extra-bold.ttf
diff --git a/src/assets/fonts/gilroy/gilroy-extra-bold.woff b/src/assets/fonts/gilroy/gilroy-extra-bold.woff
diff --git a/src/assets/fonts/gilroy/gilroy-extra-bold.woff2 b/src/assets/fonts/gilroy/gilroy-extra-bold.woff2
diff --git a/src/assets/fonts/gilroy/gilroy-medium.otf b/src/assets/fonts/gilroy/gilroy-medium.otf